From 7fed1a0444615c58db11966486fc06576fa5b9dc Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Wed, 31 Jul 2002 21:50:33 +0000 Subject: [PATCH] re PR libstdc++/7442 (cxxabi.h does not match the C++ ABI) 2002-07-31 Benjamin Kosnik Mark Mitchell PR libstdc++/7442 * libsupc++/cxxabi.h (class __base_class_type_info::hwm_bit): Change to __hwm_bit. (__class_type_info): And here. Co-Authored-By: Mark Mitchell From-SVN: r55911 --- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/libsupc++/cxxabi.h | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f23c8801df87..d051b436b91d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2002-07-31 Benjamin Kosnik + Mark Mitchell + + PR libstdc++/7442 + * libsupc++/cxxabi.h (class __base_class_type_info::hwm_bit): + Change to __hwm_bit. + (__class_type_info): And here. + 2002-07-31 Benjamin Kosnik PR libstdc++/7442 diff --git a/libstdc++-v3/libsupc++/cxxabi.h b/libstdc++-v3/libsupc++/cxxabi.h index 2210dbd33930..371b77ef2b87 100644 --- a/libstdc++-v3/libsupc++/cxxabi.h +++ b/libstdc++-v3/libsupc++/cxxabi.h @@ -216,7 +216,7 @@ public: enum __offset_flags_masks { __virtual_mask = 0x1, __public_mask = 0x2, - hwm_bit = 2, + __hwm_bit = 2, __offset_shift = 8 /* bits to shift offset by */ }; @@ -261,7 +261,7 @@ public: __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_mask = 1 << __base_class_type_info::__hwm_bit, /* contained within us */ __contained_private = __contained_mask, __contained_public = __contained_mask | __contained_public_mask -- 2.47.3