svn commit: r233699 - head/contrib/libstdc++/libsupc++

[David Chisnall]

Author: theraven
Date: Fri Mar 30 12:48:36 2012
New Revision: 233699
URL: http://svn.freebsd.org/changeset/base/233699

Log:
  Undo the earlier revert of the ABI change in libsupc++.  On further discussion,
  posting an errata notice with 9.1 is the less painful solution.
  
  Approved by:	dim (mentor)

Modified:
  head/contrib/libstdc++/libsupc++/typeinfo

Modified: head/contrib/libstdc++/libsupc++/typeinfo
==============================================================================
--- head/contrib/libstdc++/libsupc++/typeinfo	Fri Mar 30 12:34:34 2012	(r233698)
+++ head/contrib/libstdc++/libsupc++/typeinfo	Fri Mar 30 12:48:36 2012	(r233699)
@@ -100,6 +100,12 @@ namespace std 
     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;