aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Kosnik <bkoz@redhat.com>2007-10-06 23:40:32 +0000
committerBenjamin Kosnik <bkoz@gcc.gnu.org>2007-10-06 23:40:32 +0000
commit049d24222dcadcf2d3d5c24005992d83303c3743 (patch)
treea403b94002e604777685959b5b2b9c0234c95c22
parentce2a7a944beea83da44ade1b2109423279f06114 (diff)
downloadgcc-049d24222dcadcf2d3d5c24005992d83303c3743.zip
gcc-049d24222dcadcf2d3d5c24005992d83303c3743.tar.gz
gcc-049d24222dcadcf2d3d5c24005992d83303c3743.tar.bz2
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: r129058
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/libsupc++/typeinfo14
2 files changed, 12 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 90289e1..d7e2694 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
2007-10-06 Benjamin Kosnik <bkoz@redhat.com>
+ PR libstdc++/33678
+ * libsupc++/typeinfo (typeinfo): Revert ordering of virtual components.
+
+2007-10-06 Benjamin Kosnik <bkoz@redhat.com>
+
PR libstdc++/33487
* include/parallel/algorithmfwd.h (for_each, generate, generate_n,
transform, replace, replace_if, max_element, min_element, count,
diff --git a/libstdc++-v3/libsupc++/typeinfo b/libstdc++-v3/libsupc++/typeinfo
index cfcbbcc..773d2f5 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;