This is the mail archive of the libstdc++@gcc.gnu.org mailing list for the libstdc++ project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Names of C++ header include guards


> What I do not understand is why we removed the _GLIBPCPP prefix (or
> _CPP_BITS) instead of replacing it just with _GLIBCXX_.  what was the
> rationale? 
> 
> -- Gaby

Here is a patch to use the _GLIBCXX_ prefix on all the header file
guards in c_std and std.  I also did a couple of small cleanups in the
patch to make the endif's in the files more consistent (make all the
c_std files have no comment on endif, make all the std files have a
comment).

I am testing it now to make sure there are no typos and can check this
in if people think this is the appropriate prefix to use.  It makes
sense to me, though I could understand the desire for a file guard
specific suffix as well as the prefix.  I like the prefix since that
puts everything the _GLIBCXX_ namespace, a suffix could be used to
seperate it from other _GLIBCXX_ macros if we thought that was
worthwhile.

Steve Ellcey
sje@cup.hp.com

2003-07-22  Steve Ellcey  <sje@cup.hp.com>

	* include/c_std/cmath.tcc: Use _GLIBCXX_ prefix on file guard.
	* include/c_std/std_cctype.h: Ditto.
	* include/c_std/std_cerrno.h: Ditto.
	* include/c_std/std_cfloat.h: Ditto.
	* include/c_std/std_climits.h: Ditto.
	* include/c_std/std_clocale.h: Ditto.
	* include/c_std/std_cmath.h: Ditto.
	* include/c_std/std_csetjmp.h: Ditto.
	* include/c_std/std_csignal.h: Ditto.
	* include/c_std/std_cstdarg.h: Ditto.
	* include/c_std/std_cstddef.h: Ditto.
	* include/c_std/std_cstdio.h: Ditto.
	* include/c_std/std_cstdlib.h: Ditto.
	* include/c_std/std_cstring.h: Ditto.
	* include/c_std/std_ctime.h: Ditto.
	* include/c_std/std_cwchar.h: Ditto.
	* include/c_std/std_cwctype.h: Ditto.
	* include/std/std_algorithm.h: Ditto.
	* include/std/std_bitset.h: Ditto.
	* include/std/std_complex.h: Ditto.
	* include/std/std_deque.h: Ditto.
	* include/std/std_fstream.h: Ditto.
	* include/std/std_functional.h: Ditto.
	* include/std/std_iomanip.h: Ditto.
	* include/std/std_ios.h: Ditto.
	* include/std/std_iosfwd.h: Ditto.
	* include/std/std_iostream.h: Ditto.
	* include/std/std_istream.h: Ditto.
	* include/std/std_iterator.h: Ditto.
	* include/std/std_limits.h: Ditto.
	* include/std/std_list.h: Ditto.
	* include/std/std_locale.h: Ditto.
	* include/std/std_map.h: Ditto.
	* include/std/std_memory.h: Ditto.
	* include/std/std_numeric.h: Ditto.
	* include/std/std_ostream.h: Ditto.
	* include/std/std_queue.h: Ditto.
	* include/std/std_set.h: Ditto.
	* include/std/std_sstream.h: Ditto.
	* include/std/std_stack.h: Ditto.
	* include/std/std_stdexcept.h: Ditto.
	* include/std/std_streambuf.h: Ditto.
	* include/std/std_string.h: Ditto.
	* include/std/std_utility.h: Ditto.
	* include/std/std_valarray.h: Ditto.
	* include/std/std_vector.h: Ditto.
*** gcc.orig/gcc/libstdc++-v3/include/c_std/cmath.tcc	Tue Jul 22 09:41:40 2003
--- gcc/gcc/libstdc++-v3/include/c_std/cmath.tcc	Tue Jul 22 09:46:21 2003
***************
*** 29,36 ****
  
  // This file was written by Gabriel Dos Reis <gdr@codesourcery.com>
  
! #ifndef _CMATH_TCC
! #define _CMATH_TCC 1
  
  namespace std 
  {
--- 29,36 ----
  
  // This file was written by Gabriel Dos Reis <gdr@codesourcery.com>
  
! #ifndef _GLIBCXX_CMATH_TCC
! #define _GLIBCXX_CMATH_TCC 1
  
  namespace std 
  {
*** gcc.orig/gcc/libstdc++-v3/include/c_std/std_cctype.h	Tue Jul 22 09:41:40 2003
--- gcc/gcc/libstdc++-v3/include/c_std/std_cctype.h	Tue Jul 22 09:46:51 2003
***************
*** 40,47 ****
   *  contained in the namespace @c std.
   */
  
! #ifndef _CCTYPE
! #define _CCTYPE 1
  
  #pragma GCC system_header
  
--- 40,47 ----
   *  contained in the namespace @c std.
   */
  
! #ifndef _GLIBCXX_CCTYPE
! #define _GLIBCXX_CCTYPE 1
  
  #pragma GCC system_header
  
*** gcc.orig/gcc/libstdc++-v3/include/c_std/std_cerrno.h	Tue Jul 22 09:41:40 2003
--- gcc/gcc/libstdc++-v3/include/c_std/std_cerrno.h	Tue Jul 22 09:47:00 2003
***************
*** 40,47 ****
   *  contained in the namespace @c std.
   */
  
! #ifndef _CERRNO
! #define _CERRNO 1
  
  #pragma GCC system_header
  
--- 40,47 ----
   *  contained in the namespace @c std.
   */
  
! #ifndef _GLIBCXX_CERRNO
! #define _GLIBCXX_CERRNO 1
  
  #pragma GCC system_header
  
*** gcc.orig/gcc/libstdc++-v3/include/c_std/std_cfloat.h	Tue Jul 22 09:41:40 2003
--- gcc/gcc/libstdc++-v3/include/c_std/std_cfloat.h	Tue Jul 22 09:47:09 2003
***************
*** 40,47 ****
   *  contained in the namespace @c std.
   */
  
! #ifndef _CFLOAT
! #define _CFLOAT 1
  
  #pragma GCC system_header
  
--- 40,47 ----
   *  contained in the namespace @c std.
   */
  
! #ifndef _GLIBCXX_CFLOAT
! #define _GLIBCXX_CFLOAT 1
  
  #pragma GCC system_header
  
*** gcc.orig/gcc/libstdc++-v3/include/c_std/std_climits.h	Tue Jul 22 09:41:40 2003
--- gcc/gcc/libstdc++-v3/include/c_std/std_climits.h	Tue Jul 22 09:49:37 2003
***************
*** 41,48 ****
   *  contained in the namespace @c std.
   */
  
! #ifndef _CLIMITS
! #define _CLIMITS 1
  
  #pragma GCC system_header
  
--- 41,48 ----
   *  contained in the namespace @c std.
   */
  
! #ifndef _GLIBCXX_CLIMITS
! #define _GLIBCXX_CLIMITS 1
  
  #pragma GCC system_header
  
*** gcc.orig/gcc/libstdc++-v3/include/c_std/std_clocale.h	Tue Jul 22 09:41:40 2003
--- gcc/gcc/libstdc++-v3/include/c_std/std_clocale.h	Tue Jul 22 09:49:46 2003
***************
*** 41,48 ****
   *  contained in the namespace @c std.
   */
  
! #ifndef _CLOCALE
! #define _CLOCALE 1
  
  #pragma GCC system_header
  
--- 41,48 ----
   *  contained in the namespace @c std.
   */
  
! #ifndef _GLIBCXX_CLOCALE
! #define _GLIBCXX_CLOCALE 1
  
  #pragma GCC system_header
  
*** gcc.orig/gcc/libstdc++-v3/include/c_std/std_cmath.h	Tue Jul 22 09:41:40 2003
--- gcc/gcc/libstdc++-v3/include/c_std/std_cmath.h	Tue Jul 22 09:50:35 2003
***************
*** 41,48 ****
   *  contained in the namespace @c std.
   */
  
! #ifndef _CMATH
! #define _CMATH 1
  
  #pragma GCC system_header
  
--- 41,48 ----
   *  contained in the namespace @c std.
   */
  
! #ifndef _GLIBCXX_CMATH
! #define _GLIBCXX_CMATH 1
  
  #pragma GCC system_header
  
*** gcc.orig/gcc/libstdc++-v3/include/c_std/std_csetjmp.h	Tue Jul 22 09:41:40 2003
--- gcc/gcc/libstdc++-v3/include/c_std/std_csetjmp.h	Tue Jul 22 09:53:08 2003
***************
*** 41,48 ****
   *  contained in the namespace @c std.
   */
  
! #ifndef _CSETJMP
! #define _CSETJMP 1
  
  #pragma GCC system_header
  
--- 41,48 ----
   *  contained in the namespace @c std.
   */
  
! #ifndef _GLIBCXX_CSETJMP
! #define _GLIBCXX_CSETJMP 1
  
  #pragma GCC system_header
  
*** gcc.orig/gcc/libstdc++-v3/include/c_std/std_csignal.h	Tue Jul 22 09:41:40 2003
--- gcc/gcc/libstdc++-v3/include/c_std/std_csignal.h	Tue Jul 22 09:53:16 2003
***************
*** 41,48 ****
   *  contained in the namespace @c std.
   */
  
! #ifndef _CSIGNAL
! #define _CSIGNAL 1
  
  #pragma GCC system_header
  
--- 41,48 ----
   *  contained in the namespace @c std.
   */
  
! #ifndef _GLIBCXX_CSIGNAL
! #define _GLIBCXX_CSIGNAL 1
  
  #pragma GCC system_header
  
*** gcc.orig/gcc/libstdc++-v3/include/c_std/std_cstdarg.h	Tue Jul 22 09:41:40 2003
--- gcc/gcc/libstdc++-v3/include/c_std/std_cstdarg.h	Tue Jul 22 09:53:24 2003
***************
*** 40,47 ****
   *  contained in the namespace @c std.
   */
  
! #ifndef _CSTDARG
! #define _CSTDARG 1
  
  #pragma GCC system_header
  
--- 40,47 ----
   *  contained in the namespace @c std.
   */
  
! #ifndef _GLIBCXX_CSTDARG
! #define _GLIBCXX_CSTDARG 1
  
  #pragma GCC system_header
  
*** gcc.orig/gcc/libstdc++-v3/include/c_std/std_cstddef.h	Tue Jul 22 09:41:40 2003
--- gcc/gcc/libstdc++-v3/include/c_std/std_cstddef.h	Tue Jul 22 09:53:32 2003
***************
*** 40,47 ****
   *  contained in the namespace @c std.
   */
  
! #ifndef _CSTDDEF
! #define _CSTDDEF 1
  
  #pragma GCC system_header
  
--- 40,47 ----
   *  contained in the namespace @c std.
   */
  
! #ifndef _GLIBCXX_CSTDDEF
! #define _GLIBCXX_CSTDDEF 1
  
  #pragma GCC system_header
  
*** gcc.orig/gcc/libstdc++-v3/include/c_std/std_cstdio.h	Tue Jul 22 09:41:40 2003
--- gcc/gcc/libstdc++-v3/include/c_std/std_cstdio.h	Tue Jul 22 09:53:39 2003
***************
*** 41,48 ****
   *  contained in the namespace @c std.
   */
  
! #ifndef _CSTDIO
! #define _CSTDIO 1
  
  #pragma GCC system_header
  
--- 41,48 ----
   *  contained in the namespace @c std.
   */
  
! #ifndef _GLIBCXX_CSTDIO
! #define _GLIBCXX_CSTDIO 1
  
  #pragma GCC system_header
  
*** gcc.orig/gcc/libstdc++-v3/include/c_std/std_cstdlib.h	Tue Jul 22 09:41:40 2003
--- gcc/gcc/libstdc++-v3/include/c_std/std_cstdlib.h	Tue Jul 22 09:53:46 2003
***************
*** 41,48 ****
   *  contained in the namespace @c std.
   */
  
! #ifndef _CSTDLIB
! #define _CSTDLIB 1
  
  #pragma GCC system_header
  
--- 41,48 ----
   *  contained in the namespace @c std.
   */
  
! #ifndef _GLIBCXX_CSTDLIB
! #define _GLIBCXX_CSTDLIB 1
  
  #pragma GCC system_header
  
*** gcc.orig/gcc/libstdc++-v3/include/c_std/std_cstring.h	Tue Jul 22 09:41:40 2003
--- gcc/gcc/libstdc++-v3/include/c_std/std_cstring.h	Tue Jul 22 09:53:55 2003
***************
*** 41,48 ****
   *  contained in the namespace @c std.
   */
  
! #ifndef _CSTRING
! #define _CSTRING 1
  
  #pragma GCC system_header
  
--- 41,48 ----
   *  contained in the namespace @c std.
   */
  
! #ifndef _GLIBCXX_CSTRING
! #define _GLIBCXX_CSTRING 1
  
  #pragma GCC system_header
  
*** gcc.orig/gcc/libstdc++-v3/include/c_std/std_ctime.h	Tue Jul 22 09:41:40 2003
--- gcc/gcc/libstdc++-v3/include/c_std/std_ctime.h	Tue Jul 22 09:50:47 2003
***************
*** 41,48 ****
   *  contained in the namespace @c std.
   */
  
! #ifndef _CTIME
! #define _CTIME 1
  
  #pragma GCC system_header
  
--- 41,48 ----
   *  contained in the namespace @c std.
   */
  
! #ifndef _GLIBCXX_CTIME
! #define _GLIBCXX_CTIME 1
  
  #pragma GCC system_header
  
*** gcc.orig/gcc/libstdc++-v3/include/c_std/std_cwchar.h	Tue Jul 22 09:41:40 2003
--- gcc/gcc/libstdc++-v3/include/c_std/std_cwchar.h	Tue Jul 22 09:50:55 2003
***************
*** 41,48 ****
   *  contained in the namespace @c std.
   */
  
! #ifndef _CWCHAR
! #define _CWCHAR 1
  
  #pragma GCC system_header
  
--- 41,48 ----
   *  contained in the namespace @c std.
   */
  
! #ifndef _GLIBCXX_CWCHAR
! #define _GLIBCXX_CWCHAR 1
  
  #pragma GCC system_header
  
*** gcc.orig/gcc/libstdc++-v3/include/c_std/std_cwctype.h	Tue Jul 22 09:41:40 2003
--- gcc/gcc/libstdc++-v3/include/c_std/std_cwctype.h	Tue Jul 22 09:51:04 2003
***************
*** 41,48 ****
   *  contained in the namespace @c std.
   */
  
! #ifndef _CWCTYPE
! #define _CWCTYPE 1
  
  #pragma GCC system_header
  
--- 41,48 ----
   *  contained in the namespace @c std.
   */
  
! #ifndef _GLIBCXX_CWCTYPE
! #define _GLIBCXX_CWCTYPE 1
  
  #pragma GCC system_header
  
*** gcc.orig/gcc/libstdc++-v3/include/std/std_algorithm.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_algorithm.h	Tue Jul 22 09:55:47 2003
***************
*** 58,65 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _ALGORITHM
! #define _ALGORITHM 1
  
  #pragma GCC system_header
  
--- 58,65 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_ALGORITHM
! #define _GLIBCXX_ALGORITHM 1
  
  #pragma GCC system_header
  
***************
*** 68,74 ****
  #include <bits/stl_uninitialized.h>
  #include <bits/stl_algo.h>
  
! #endif /* _ALGORITHM */
  
  // Local Variables:
  // mode:C++
--- 68,74 ----
  #include <bits/stl_uninitialized.h>
  #include <bits/stl_algo.h>
  
! #endif /* _GLIBCXX_ALGORITHM */
  
  // Local Variables:
  // mode:C++
*** gcc.orig/gcc/libstdc++-v3/include/std/std_bitset.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_bitset.h	Tue Jul 22 09:56:06 2003
***************
*** 45,52 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _BITSET
! #define _BITSET 1
  
  #pragma GCC system_header
  
--- 45,52 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_BITSET
! #define _GLIBCXX_BITSET 1
  
  #pragma GCC system_header
  
*************** namespace std
*** 1212,1215 ****
  #undef _GLIBCXX_BITSET_WORDS
  #undef _GLIBCXX_BITSET_BITS_PER_WORD
  
! #endif /* _BITSET */
--- 1212,1215 ----
  #undef _GLIBCXX_BITSET_WORDS
  #undef _GLIBCXX_BITSET_BITS_PER_WORD
  
! #endif /* _GLIBCXX_BITSET */
*** gcc.orig/gcc/libstdc++-v3/include/std/std_complex.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_complex.h	Tue Jul 22 09:56:19 2003
***************
*** 40,47 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _COMPLEX
! #define _COMPLEX 1
  
  #pragma GCC system_header
  
--- 40,47 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_COMPLEX
! #define _GLIBCXX_COMPLEX 1
  
  #pragma GCC system_header
  
*************** namespace std
*** 1062,1065 ****
    : _M_value(_ComplexT(__z._M_value)) { }
  } // namespace std
  
! #endif	/* _COMPLEX */
--- 1062,1065 ----
    : _M_value(_ComplexT(__z._M_value)) { }
  } // namespace std
  
! #endif	/* _GLIBCXX_COMPLEX */
*** gcc.orig/gcc/libstdc++-v3/include/std/std_deque.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_deque.h	Tue Jul 22 09:56:33 2003
***************
*** 58,65 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _DEQUE
! #define _DEQUE 1
  
  #pragma GCC system_header
  
--- 58,65 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_DEQUE
! #define _GLIBCXX_DEQUE 1
  
  #pragma GCC system_header
  
***************
*** 74,78 ****
  #  include <bits/deque.tcc>
  #endif
  
! #endif /* _DEQUE */
! 
--- 74,77 ----
  #  include <bits/deque.tcc>
  #endif
  
! #endif /* _GLIBCXX_DEQUE */
*** gcc.orig/gcc/libstdc++-v3/include/std/std_fstream.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_fstream.h	Tue Jul 22 09:57:08 2003
***************
*** 37,44 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _FSTREAM
! #define _FSTREAM 1
  
  #pragma GCC system_header
  
--- 37,44 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_FSTREAM
! #define _GLIBCXX_FSTREAM 1
  
  #pragma GCC system_header
  
*************** namespace std
*** 827,830 ****
  # include <bits/fstream.tcc>
  #endif
  
! #endif
--- 827,830 ----
  # include <bits/fstream.tcc>
  #endif
  
! #endif /* _GLIBCXX_FSTREAM */
*** gcc.orig/gcc/libstdc++-v3/include/std/std_functional.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_functional.h	Tue Jul 22 09:57:23 2003
***************
*** 46,60 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _FUNCTIONAL
! #define _FUNCTIONAL 1
  
  #pragma GCC system_header
  #include <bits/c++config.h>
  #include <cstddef>
  #include <bits/stl_function.h>
  
! #endif /* _FUNCTIONAL */
  
  // Local Variables:
  // mode:C++
--- 46,60 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_FUNCTIONAL
! #define _GLIBCXX_FUNCTIONAL 1
  
  #pragma GCC system_header
  #include <bits/c++config.h>
  #include <cstddef>
  #include <bits/stl_function.h>
  
! #endif /* _GLIBCXX_FUNCTIONAL */
  
  // Local Variables:
  // mode:C++
*** gcc.orig/gcc/libstdc++-v3/include/std/std_iomanip.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_iomanip.h	Tue Jul 22 09:58:42 2003
***************
*** 37,44 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _IOMANIP
! #define _IOMANIP 1
  
  #pragma GCC system_header
  
--- 37,44 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_IOMANIP
! #define _GLIBCXX_IOMANIP 1
  
  #pragma GCC system_header
  
*************** namespace std
*** 297,300 ****
  #endif
  } // namespace std
  
! #endif	
--- 297,300 ----
  #endif
  } // namespace std
  
! #endif /* _GLIBCXX_IOMANIP */
*** gcc.orig/gcc/libstdc++-v3/include/std/std_ios.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_ios.h	Tue Jul 22 09:59:00 2003
***************
*** 36,43 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _IOS
! #define _IOS 1
  
  #pragma GCC system_header
  
--- 36,43 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_IOS
! #define _GLIBCXX_IOS 1
  
  #pragma GCC system_header
  
***************
*** 50,54 ****
  #include <streambuf> 
  #include <bits/basic_ios.h>
  
! #endif	/* _IOS */
! 
--- 50,53 ----
  #include <streambuf> 
  #include <bits/basic_ios.h>
  
! #endif	/* _GLIBCXX_IOS */
*** gcc.orig/gcc/libstdc++-v3/include/std/std_iosfwd.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_iosfwd.h	Tue Jul 22 09:59:25 2003
***************
*** 37,44 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _IOSFWD
! #define _IOSFWD 1
  
  #pragma GCC system_header
  
--- 37,44 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_IOSFWD
! #define _GLIBCXX_IOSFWD 1
  
  #pragma GCC system_header
  
*************** namespace std 
*** 165,168 ****
    /** @}  */
  } // namespace std
  
! #endif
--- 165,168 ----
    /** @}  */
  } // namespace std
  
! #endif /* _GLIBCXX_IOSFWD */
*** gcc.orig/gcc/libstdc++-v3/include/std/std_iostream.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_iostream.h	Tue Jul 22 09:59:54 2003
***************
*** 36,43 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _IOSTREAM
! #define _IOSTREAM 1
  
  #pragma GCC system_header
  
--- 36,43 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_IOSTREAM
! #define _GLIBCXX_IOSTREAM 1
  
  #pragma GCC system_header
  
*************** namespace std 
*** 77,80 ****
    static ios_base::Init __ioinit;
  } // namespace std
  
! #endif
--- 77,80 ----
    static ios_base::Init __ioinit;
  } // namespace std
  
! #endif /* _GLIBCXX_IOSTREAM */
*** gcc.orig/gcc/libstdc++-v3/include/std/std_istream.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_istream.h	Tue Jul 22 10:00:16 2003
***************
*** 37,44 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _ISTREAM
! #define _ISTREAM 1
  
  #pragma GCC system_header
  
--- 37,44 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_ISTREAM
! #define _GLIBCXX_ISTREAM 1
  
  #pragma GCC system_header
  
*************** namespace std
*** 775,778 ****
  # include <bits/istream.tcc>
  #endif
  
! #endif	/* _ISTREAM */
--- 775,778 ----
  # include <bits/istream.tcc>
  #endif
  
! #endif	/* _GLIBCXX_ISTREAM */
*** gcc.orig/gcc/libstdc++-v3/include/std/std_iterator.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_iterator.h	Tue Jul 22 10:00:30 2003
***************
*** 58,65 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _ITERATOR
! #define _ITERATOR 1
  
  #pragma GCC system_header
  #include <bits/c++config.h>
--- 58,65 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_ITERATOR
! #define _GLIBCXX_ITERATOR 1
  
  #pragma GCC system_header
  #include <bits/c++config.h>
***************
*** 72,78 ****
  #include <bits/stream_iterator.h>
  #include <bits/streambuf_iterator.h>
  
! #endif /* _ITERATOR */
  
  // Local Variables:
  // mode:C++
--- 72,78 ----
  #include <bits/stream_iterator.h>
  #include <bits/streambuf_iterator.h>
  
! #endif /* _GLIBCXX_ITERATOR */
  
  // Local Variables:
  // mode:C++
*** gcc.orig/gcc/libstdc++-v3/include/std/std_limits.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_limits.h	Tue Jul 22 10:01:03 2003
***************
*** 40,47 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _NUMERIC_LIMITS
! #define _NUMERIC_LIMITS 1
  
  #pragma GCC system_header
  
--- 40,47 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_NUMERIC_LIMITS
! #define _GLIBCXX_NUMERIC_LIMITS 1
  
  #pragma GCC system_header
  
*************** namespace std
*** 1140,1143 ****
  #undef __glibcxx_digits
  #undef __glibcxx_digits10
  
! #endif // _NUMERIC_LIMITS
--- 1140,1143 ----
  #undef __glibcxx_digits
  #undef __glibcxx_digits10
  
! #endif // _GLIBCXX_NUMERIC_LIMITS
*** gcc.orig/gcc/libstdc++-v3/include/std/std_list.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_list.h	Tue Jul 22 10:01:15 2003
***************
*** 58,65 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _LIST
! #define _LIST 1
  
  #pragma GCC system_header
  
--- 58,65 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_LIST
! #define _GLIBCXX_LIST 1
  
  #pragma GCC system_header
  
***************
*** 74,78 ****
  #  include <bits/list.tcc>
  #endif
  
! #endif /* _LIST */
  
--- 74,78 ----
  #  include <bits/list.tcc>
  #endif
  
! #endif /* _GLIBCXX_LIST */
  
*** gcc.orig/gcc/libstdc++-v3/include/std/std_locale.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_locale.h	Tue Jul 22 10:01:31 2003
***************
*** 36,43 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _LOCALE
! #define _LOCALE	1
  
  #pragma GCC system_header
  
--- 36,43 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_LOCALE
! #define _GLIBCXX_LOCALE	1
  
  #pragma GCC system_header
  
***************
*** 46,49 ****
  #include <bits/locale_facets.h>
  #include <bits/locale_facets.tcc>
  
! #endif
--- 46,49 ----
  #include <bits/locale_facets.h>
  #include <bits/locale_facets.tcc>
  
! #endif /* _GLIBCXX_LOCALE */
*** gcc.orig/gcc/libstdc++-v3/include/std/std_map.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_map.h	Tue Jul 22 10:01:46 2003
***************
*** 58,65 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _MAP
! #define _MAP 1
  
  #pragma GCC system_header
  
--- 58,65 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_MAP
! #define _GLIBCXX_MAP 1
  
  #pragma GCC system_header
  
***************
*** 67,73 ****
  #include <bits/stl_map.h>
  #include <bits/stl_multimap.h>
  
! #endif /* _MAP */
  
  // Local Variables:
  // mode:C++
--- 67,73 ----
  #include <bits/stl_map.h>
  #include <bits/stl_multimap.h>
  
! #endif /* _GLIBCXX_MAP */
  
  // Local Variables:
  // mode:C++
*** gcc.orig/gcc/libstdc++-v3/include/std/std_memory.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_memory.h	Tue Jul 22 10:02:10 2003
***************
*** 46,53 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _MEMORY
! #define _MEMORY 1
  
  #pragma GCC system_header
  
--- 46,53 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_MEMORY
! #define _GLIBCXX_MEMORY 1
  
  #pragma GCC system_header
  
*************** namespace std
*** 355,358 ****
    };
  } // namespace std
  
! #endif 
--- 355,358 ----
    };
  } // namespace std
  
! #endif /* _GLIBCXX_MEMORY */
*** gcc.orig/gcc/libstdc++-v3/include/std/std_numeric.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_numeric.h	Tue Jul 22 10:02:25 2003
***************
*** 58,65 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _NUMERIC
! #define _NUMERIC 1
  
  #pragma GCC system_header
  #include <bits/c++config.h>
--- 58,65 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_NUMERIC
! #define _GLIBCXX_NUMERIC 1
  
  #pragma GCC system_header
  #include <bits/c++config.h>
***************
*** 68,74 ****
  #include <bits/stl_function.h>
  #include <bits/stl_numeric.h>
  
! #endif /* _NUMERIC */
  
  // Local Variables:
  // mode:C++
--- 68,74 ----
  #include <bits/stl_function.h>
  #include <bits/stl_numeric.h>
  
! #endif /* _GLIBCXX_NUMERIC */
  
  // Local Variables:
  // mode:C++
*** gcc.orig/gcc/libstdc++-v3/include/std/std_ostream.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_ostream.h	Tue Jul 22 10:02:37 2003
***************
*** 37,44 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _OSTREAM
! #define _OSTREAM 1
  
  #pragma GCC system_header
  
--- 37,44 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_OSTREAM
! #define _GLIBCXX_OSTREAM 1
  
  #pragma GCC system_header
  
*************** namespace std
*** 548,551 ****
  # include <bits/ostream.tcc>
  #endif
  
! #endif	/* _OSTREAM */
--- 548,551 ----
  # include <bits/ostream.tcc>
  #endif
  
! #endif	/* _GLIBCXX_OSTREAM */
*** gcc.orig/gcc/libstdc++-v3/include/std/std_queue.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_queue.h	Tue Jul 22 10:02:48 2003
***************
*** 58,65 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _QUEUE
! #define _QUEUE 1
  
  #pragma GCC system_header
  #include <bits/c++config.h>
--- 58,65 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_QUEUE
! #define _GLIBCXX_QUEUE 1
  
  #pragma GCC system_header
  #include <bits/c++config.h>
***************
*** 79,82 ****
  #  include <bits/vector.tcc>
  #endif
  
! #endif /* _QUEUE */
--- 79,82 ----
  #  include <bits/vector.tcc>
  #endif
  
! #endif /* _GLIBCXX_QUEUE */
*** gcc.orig/gcc/libstdc++-v3/include/std/std_set.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_set.h	Tue Jul 22 10:15:42 2003
***************
*** 58,65 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _SET
! #define _SET 1
  
  #pragma GCC system_header
  
--- 58,65 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_SET
! #define _GLIBCXX_SET 1
  
  #pragma GCC system_header
  
***************
*** 67,73 ****
  #include <bits/stl_set.h>
  #include <bits/stl_multiset.h>
  
! #endif /* _SET */
  
  // Local Variables:
  // mode:C++
--- 67,73 ----
  #include <bits/stl_set.h>
  #include <bits/stl_multiset.h>
  
! #endif /* _GLIBCXX_SET */
  
  // Local Variables:
  // mode:C++
*** gcc.orig/gcc/libstdc++-v3/include/std/std_sstream.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_sstream.h	Tue Jul 22 10:16:15 2003
***************
*** 36,43 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _SSTREAM
! #define _SSTREAM 1
  
  #pragma GCC system_header
  
--- 36,43 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_SSTREAM
! #define _GLIBCXX_SSTREAM 1
  
  #pragma GCC system_header
  
*************** namespace std
*** 648,651 ****
  # include <bits/sstream.tcc>
  #endif
  
! #endif
--- 648,651 ----
  # include <bits/sstream.tcc>
  #endif
  
! #endif /* _GLIBCXX_SSTREAM */
*** gcc.orig/gcc/libstdc++-v3/include/std/std_stack.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_stack.h	Tue Jul 22 10:16:30 2003
***************
*** 58,65 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _STACK
! #define _STACK 1
  
  #pragma GCC system_header
  
--- 58,65 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_STACK
! #define _GLIBCXX_STACK 1
  
  #pragma GCC system_header
  
***************
*** 74,77 ****
  #  include <bits/deque.tcc>
  #endif
  
! #endif /* _STACK */
--- 74,77 ----
  #  include <bits/deque.tcc>
  #endif
  
! #endif /* _GLIBCXX_STACK */
*** gcc.orig/gcc/libstdc++-v3/include/std/std_stdexcept.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_stdexcept.h	Tue Jul 22 10:16:49 2003
***************
*** 36,43 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _STDEXCEPT
! #define _STDEXCEPT 1
  
  #pragma GCC system_header
  
--- 36,43 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_STDEXCEPT
! #define _GLIBCXX_STDEXCEPT 1
  
  #pragma GCC system_header
  
*************** namespace std 
*** 145,148 ****
    };
  } // namespace std
  
! #endif // _STDEXCEPT
--- 145,148 ----
    };
  } // namespace std
  
! #endif /* _GLIBCXX_STDEXCEPT */
*** gcc.orig/gcc/libstdc++-v3/include/std/std_streambuf.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_streambuf.h	Tue Jul 22 10:18:05 2003
***************
*** 37,44 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _STREAMBUF
! #define _STREAMBUF 1
  
  #pragma GCC system_header
  
--- 37,44 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _CLIBXX_STREAMBUF
! #define _CLIBXX_STREAMBUF 1
  
  #pragma GCC system_header
  
*************** namespace std
*** 784,787 ****
  #include <bits/streambuf.tcc>
  #endif
  
! #endif	
--- 784,787 ----
  #include <bits/streambuf.tcc>
  #endif
  
! #endif /* _GLIBCXX_STREAMBUF */
*** gcc.orig/gcc/libstdc++-v3/include/std/std_string.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_string.h	Tue Jul 22 10:18:21 2003
***************
*** 37,44 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _STRING
! #define _STRING	1
  
  #pragma GCC system_header
  
--- 37,44 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_STRING
! #define _GLIBCXX_STRING	1
  
  #pragma GCC system_header
  
***************
*** 57,61 ****
  # include <bits/basic_string.tcc> 
  #endif
  
! #endif /* _STRING */
! 
--- 57,60 ----
  # include <bits/basic_string.tcc> 
  #endif
  
! #endif /* _GLIBCXX_STRING */
*** gcc.orig/gcc/libstdc++-v3/include/std/std_utility.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_utility.h	Tue Jul 22 10:03:00 2003
***************
*** 58,72 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _UTILITY
! #define _UTILITY 1
  
  #pragma GCC system_header
  #include <bits/c++config.h>
  #include <bits/stl_relops.h>
  #include <bits/stl_pair.h>
  
! #endif /* _UTILITY */
  
  // Local Variables:
  // mode:C++
--- 58,72 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_UTILITY
! #define _GLIBCXX_UTILITY 1
  
  #pragma GCC system_header
  #include <bits/c++config.h>
  #include <bits/stl_relops.h>
  #include <bits/stl_pair.h>
  
! #endif /* _GLIBCXX_UTILITY */
  
  // Local Variables:
  // mode:C++
*** gcc.orig/gcc/libstdc++-v3/include/std/std_valarray.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_valarray.h	Tue Jul 22 10:03:21 2003
***************
*** 35,42 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _VALARRAY
! #define _VALARRAY 1
  
  #pragma GCC system_header
  
--- 35,42 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_VALARRAY
! #define _GLIBCXX_VALARRAY 1
  
  #pragma GCC system_header
  
*************** _DEFINE_BINARY_OPERATOR(>=, __greater_eq
*** 689,695 ****
  
  } // namespace std
  
! #endif // _VALARRAY
  
  // Local Variables:
  // mode:c++
--- 689,695 ----
  
  } // namespace std
  
! #endif /* _GLIBCXX_VALARRAY */
  
  // Local Variables:
  // mode:c++
*** gcc.orig/gcc/libstdc++-v3/include/std/std_vector.h	Tue Jul 22 09:42:12 2003
--- gcc/gcc/libstdc++-v3/include/std/std_vector.h	Tue Jul 22 10:03:36 2003
***************
*** 58,65 ****
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _VECTOR
! #define _VECTOR 1
  
  #pragma GCC system_header
  
--- 58,65 ----
   *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
   */
  
! #ifndef _GLIBCXX_VECTOR
! #define _GLIBCXX_VECTOR 1
  
  #pragma GCC system_header
  
***************
*** 75,79 ****
  #  include <bits/vector.tcc>
  #endif
  
! #endif /* _VECTOR */
  
--- 75,79 ----
  #  include <bits/vector.tcc>
  #endif
  
! #endif /* _GLIBCXX_VECTOR */
  


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]