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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f23c8801df87c4f755eb9478871fa29ef5fe2692..d051b436b91d238a305a83a06aba5bad9088ea06 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+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

diff --git a/libstdc++-v3/libsupc++/cxxabi.h b/libstdc++-v3/libsupc++/cxxabi.h
index 2210dbd339308fd583ffc55eac7a423108583514..371b77ef2b8736cd870e1e7925e249ab260f4687 100644 (file)
--- 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