diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2002-07-31 21:50:33 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2002-07-31 21:50:33 +0000 |
| commit | 7fed1a0444615c58db11966486fc06576fa5b9dc (patch) | |
| tree | c03d972405c5d1266b40ff5acd2c21871b772c4e | |
| parent | 3bba6ebbe4f1845403009f1dba3da0d721682178 (diff) | |
| download | gcc-7fed1a0444615c58db11966486fc06576fa5b9dc.zip gcc-7fed1a0444615c58db11966486fc06576fa5b9dc.tar.gz gcc-7fed1a0444615c58db11966486fc06576fa5b9dc.tar.bz2 | |
re PR libstdc++/7442 (cxxabi.h does not match the C++ ABI)
2002-07-31 Benjamin Kosnik <bkoz@redhat.com>
Mark Mitchell <mark@codesourcery.com>
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 <mark@codesourcery.com>
From-SVN: r55911
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/cxxabi.h | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f23c880..d051b43 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,4 +1,12 @@ 2002-07-31 Benjamin Kosnik <bkoz@redhat.com> + Mark Mitchell <mark@codesourcery.com> + + 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 <bkoz@redhat.com> PR libstdc++/7442 * libsupc++/cxxabi.h diff --git a/libstdc++-v3/libsupc++/cxxabi.h b/libstdc++-v3/libsupc++/cxxabi.h index 2210dbd..371b77e 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 |