diff options
Diffstat (limited to 'contrib/libstdc++/libsupc++/cxxabi.h')
-rw-r--r-- | contrib/libstdc++/libsupc++/cxxabi.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/contrib/libstdc++/libsupc++/cxxabi.h b/contrib/libstdc++/libsupc++/cxxabi.h index dd6b774..371b77e 100644 --- a/contrib/libstdc++/libsupc++/cxxabi.h +++ b/contrib/libstdc++/libsupc++/cxxabi.h @@ -1,6 +1,6 @@ // new abi support -*- C++ -*- -// Copyright (C) 2000 Free Software Foundation, Inc. +// Copyright (C) 2000, 2002 Free Software Foundation, Inc. // // This file is part of GNU CC. // @@ -117,7 +117,7 @@ class __pbase_type_info { /* abi defined member variables */ public: - unsigned int __qualifier_flags; /* qualification of the target object */ + unsigned int __flags; /* qualification of the target object */ const std::type_info *__pointee; /* type of pointed to object */ /* abi defined member functions */ @@ -127,12 +127,12 @@ public: explicit __pbase_type_info (const char *__n, int __quals, const std::type_info *__type) - : std::type_info (__n), __qualifier_flags (__quals), __pointee (__type) + : std::type_info (__n), __flags (__quals), __pointee (__type) { } /* implementation defined types */ public: - enum __qualifier_masks { + enum __masks { __const_mask = 0x1, __volatile_mask = 0x2, __restrict_mask = 0x4, @@ -181,7 +181,7 @@ class __pointer_to_member_type_info { /* abi defined member variables */ public: - __class_type_info *__context_class; /* class of the member */ + __class_type_info *__context; /* class of the member */ /* abi defined member functions */ public: @@ -191,7 +191,7 @@ public: int __quals, const std::type_info *__type, __class_type_info *__klass) - : __pbase_type_info (__n, __quals, __type), __context_class (__klass) + : __pbase_type_info (__n, __quals, __type), __context (__klass) { } /* implementation defined member functions */ @@ -204,11 +204,11 @@ protected: class __class_type_info; /* helper class for __vmi_class_type */ -class __base_class_info +class __base_class_type_info { /* abi defined member variables */ public: - const __class_type_info *__base; /* base class type */ + const __class_type_info* __base_type; /* base class type */ long __offset_flags; /* offset and info */ /* implementation defined types */ @@ -216,8 +216,8 @@ public: enum __offset_flags_masks { __virtual_mask = 0x1, __public_mask = 0x2, - hwm_bit = 2, - offset_shift = 8 /* bits to shift offset by */ + __hwm_bit = 2, + __offset_shift = 8 /* bits to shift offset by */ }; /* implementation defined member functions */ @@ -230,7 +230,7 @@ public: { // This shift, being of a signed type, is implementation defined. GCC // implements such shifts as arithmetic, which is what we want. - return static_cast<__PTRDIFF_TYPE__> (__offset_flags) >> offset_shift; + return static_cast<__PTRDIFF_TYPE__> (__offset_flags) >> __offset_shift; } }; @@ -259,9 +259,9 @@ public: /* publicly) */ __contained_ambig, /* contained ambiguously */ - __contained_virtual_mask = __base_class_info::__virtual_mask, /* via a virtual path */ - __contained_public_mask = __base_class_info::__public_mask, /* via a public path */ - __contained_mask = 1 << __base_class_info::hwm_bit, /* contained within us */ + __contained_virtual_mask = __base_class_type_info::__virtual_mask, /* via a virtual path */ + __contained_public_mask = __base_class_type_info::__public_mask, /* via a public path */ + __contained_mask = 1 << __base_class_type_info::__hwm_bit, /* contained within us */ __contained_private = __contained_mask, __contained_public = __contained_mask | __contained_public_mask @@ -365,7 +365,7 @@ class __vmi_class_type_info : public __class_type_info { public: unsigned int __flags; /* details about the class hierarchy */ unsigned int __base_count; /* number of direct bases */ - __base_class_info const __base_info[1]; /* array of bases */ + __base_class_type_info __base_info[1]; /* array of bases */ /* The array of bases uses the trailing array struct hack so this class is not constructable with a normal constructor. It is internally generated by the compiler. */ |