From 049d24222dcadcf2d3d5c24005992d83303c3743 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Sat, 6 Oct 2007 23:40:32 +0000 Subject: [PATCH] re PR libstdc++/33678 (__do_catch, __do_upcast ABI change) 2007-10-06 Benjamin Kosnik PR libstdc++/33678 * libsupc++/typeinfo (typeinfo): Revert ordering of virtual components. From-SVN: r129058 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/libsupc++/typeinfo | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 90289e105bec..d7e2694f5d8d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2007-10-06 Benjamin Kosnik + + PR libstdc++/33678 + * libsupc++/typeinfo (typeinfo): Revert ordering of virtual components. + 2007-10-06 Benjamin Kosnik PR libstdc++/33487 diff --git a/libstdc++-v3/libsupc++/typeinfo b/libstdc++-v3/libsupc++/typeinfo index cfcbbcc08968..773d2f5ca4af 100644 --- a/libstdc++-v3/libsupc++/typeinfo +++ b/libstdc++-v3/libsupc++/typeinfo @@ -127,7 +127,13 @@ namespace std #endif bool operator!=(const type_info& __arg) const { return !operator==(__arg); } - + + // Return true if this is a pointer type of some kind + virtual bool __is_pointer_p() const; + + // Return true if this is a function type + virtual bool __is_function_p() const; + // Try and catch a thrown type. Store an adjusted pointer to the // caught type in THR_OBJ. If THR_TYPE is not a pointer type, then // THR_OBJ points to the thrown object. If THR_TYPE is a pointer @@ -141,12 +147,6 @@ namespace std virtual bool __do_upcast(const __cxxabiv1::__class_type_info *__target, void **__obj_ptr) const; - // Return true if this is a pointer type of some kind - virtual bool __is_pointer_p() const; - - // Return true if this is a function type - virtual bool __is_function_p() const; - protected: const char *__name; -- 2.47.2