re PR libstdc++/33678 (__do_catch, __do_upcast ABI change)

2007-10-06  Benjamin Kosnik  <bkoz@redhat.com>

	PR libstdc++/33678
	* libsupc++/typeinfo (typeinfo): Revert ordering of virtual components.

From-SVN: r129061

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d915bcf66fbedb2ba24b8aa8c050fc38906772f4..6df18b0ccf950a8755d960ff140d13ebe3ffc613 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-06  Benjamin Kosnik  <bkoz@redhat.com>
+
+       PR libstdc++/33678      
+       * libsupc++/typeinfo (typeinfo): Revert ordering of virtual components.
+
 2007-08-28  Paolo Carlini  <pcarlini@suse.de>
 
        PR libstdc++/33128

diff --git a/libstdc++-v3/libsupc++/typeinfo b/libstdc++-v3/libsupc++/typeinfo
index 90ac18a801f2e38782db74fc0b8bd7f23ce5def1..cddb65eda8f547a0d34f855a839a022d1969f748 100644 (file)
--- a/libstdc++-v3/libsupc++/typeinfo
+++ b/libstdc++-v3/libsupc++/typeinfo
@@ -99,7 +99,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
@@ -113,12 +119,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;