remaining shadow/ Swamp -> legacy changes

Nathan Myers ncm@cantrip.org
Sat May 20 01:56:00 GMT 2000


Here is what I hope is the last s/swamp/legacy/ diff for shadow headers.

Nathan Myers
ncm at cantrip dot org

---------------------

Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/ChangeLog,v
retrieving revision 1.35
diff -r1.35 ChangeLog
0a1,3
> 2000-05-19   Nathan C. Myers  <ncm@cantrip.org>
> 	* bits/generic_shadow.h: s/swamp/legacy/
> 
145a149
> >>>>>>> 1.35
Index: bits/generic_shadow.h
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/bits/generic_shadow.h,v
retrieving revision 1.1
diff -c -r1.1 generic_shadow.h
*** generic_shadow.h	2000/04/21 20:33:28	1.1
--- generic_shadow.h	2000/05/20 08:51:15
***************
*** 30,57 ****
  // This file is included by all the standard C <foo.h> headers
  // after defining _SHADOW_NAME.
  
! #ifdef _IN_C_SWAMP_  /* sub-included by a C header */
  
        // get out of the "swamp"
      } // close extern "C"
!   }   // close namespace _C_Swamp::
  
! # undef _IN_C_SWAMP_
  # include _SHADOW_NAME
  
    // dive back into the "swamp"
!   namespace _C_Swamp {
      extern "C" {
! #     define _IN_C_SWAMP_
    
! #else /* not _IN_C_SWAMP_:  directly included by user program */
    
  # include _SHADOW_NAME
    
    // expose global C names, including non-standard ones, but shadow
    //   some names and types with the std:: C++ version.
  
!   using namespace ::_C_Swamp::_C_Shadow;
    
! #endif /* _IN_C_SWAMP_ */
      
--- 30,57 ----
  // This file is included by all the standard C <foo.h> headers
  // after defining _SHADOW_NAME.
  
! #ifdef _IN_C_LEGACY_  /* sub-included by a C header */
  
        // get out of the "swamp"
      } // close extern "C"
!   }   // close namespace _C_legacy::
  
! # undef _IN_C_LEGACY_
  # include _SHADOW_NAME
  
    // dive back into the "swamp"
!   namespace _C_legacy {
      extern "C" {
! #     define _IN_C_LEGACY_
    
! #else /* not _IN_C_LEGACY_:  directly included by user program */
    
  # include _SHADOW_NAME
    
    // expose global C names, including non-standard ones, but shadow
    //   some names and types with the std:: C++ version.
  
!   using namespace ::_C_legacy::_C_shadow;
    
! #endif /* _IN_C_LEGACY_ */
      


More information about the Libstdc++ mailing list