[v3] libstdc++/7442 part two

[Benjamin Kosnik]

as per mark's suggestion...

gcc
gcc-3_2-branch

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.

Index: libsupc++/cxxabi.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/libsupc++/cxxabi.h,v
retrieving revision 1.7
diff -c -p -r1.7 cxxabi.h
*** libsupc++/cxxabi.h	31 Jul 2002 21:24:18 -0000	1.7
--- libsupc++/cxxabi.h	31 Jul 2002 21:49:12 -0000
*************** public:
*** 216,222 ****
    enum __offset_flags_masks {
      __virtual_mask = 0x1,
      __public_mask = 0x2,
!     hwm_bit = 2,
      __offset_shift = 8          /* bits to shift offset by */
    };
    
--- 216,222 ----
    enum __offset_flags_masks {
      __virtual_mask = 0x1,
      __public_mask = 0x2,
!     __hwm_bit = 2,
      __offset_shift = 8          /* bits to shift offset by */
    };
    
*************** public:
*** 261,267 ****
      
      __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
--- 261,267 ----
      
      __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