diff options
author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-07-30 16:51:51 +0000 |
---|---|---|
committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-07-30 16:51:51 +0000 |
commit | 9449c28d9188fe66b54c52d98aa749f777ad828c (patch) | |
tree | 13412ed55892985c0028f92bab3bdc7cee7a18ef /libstdc++-v3/include | |
parent | 26012736fbfd2f0034b3d605411cadf66bfa80f9 (diff) | |
download | ppe42-gcc-9449c28d9188fe66b54c52d98aa749f777ad828c.tar.gz ppe42-gcc-9449c28d9188fe66b54c52d98aa749f777ad828c.zip |
2003-07-30 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/c++config (_GLIBCXX_FULLY_COMPLIANT_HEADERS): Remove.
(_GLIBCXX_NO_TEMPLATE_EXPORT): To _GLIBCXX_EXPORT_TEMPLATE.
(_GLIBCXX_AT_AT): Remove.
(__USE_MALLOC): Remove.
* include/std/std_fstream.h: Modify.
* include/bits/basic_ios.h: Same.
* include/bits/valarray_array.h: Same.
* include/c_std/std_cmath.h: Same.
* include/c_std/cmath.tcc: Same.
* include/std/std_vector.h: Same.
* include/std/std_string.h: Same.
* include/std/std_stack.h: Same.
* include/std/std_queue.h: Same.
* include/std/std_list.h: Same.
* include/std/std_deque.h: Same.
* include/std/std_streambuf.h: Same.
* include/std/std_sstream.h: Same.
* include/std/std_ostream.h: Same.
* include/std/std_istream.h: Same.
* include/bits/valarray_array.tcc: Same, format.
* include/c/std_cctype.h: Fix include guards.
* include/c/std_cerrno.h: Same.
* include/c/std_cfloat.h: Same.
* include/c/std_climits.h: Same.
* include/c/std_clocale.h: Same.
* include/c/std_cmath.h: Same.
* include/c/std_csetjmp.h: Same.
* include/c/std_csignal.h: Same.
* include/c/std_cstdarg.h: Same.
* include/c/std_cstddef.h: Same.
* include/c/std_cstdio.h: Same.
* include/c/std_cstdlib.h: Same.
* include/c/std_cstring.h: Same.
* include/c/std_ctime.h: Same.
* include/c/std_cwchar.h: Same.
* include/c/std_cwctype.h: Same.
* include/c_std/cmath.tcc: Same.
* include/c_std/std_cmath.h: Same.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@69961 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include')
33 files changed, 205 insertions, 249 deletions
diff --git a/libstdc++-v3/include/bits/basic_ios.h b/libstdc++-v3/include/bits/basic_ios.h index e017ddc08c2..59ecfeddd90 100644 --- a/libstdc++-v3/include/bits/basic_ios.h +++ b/libstdc++-v3/include/bits/basic_ios.h @@ -449,8 +449,7 @@ namespace std }; } // namespace std -#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT -# define export +#ifndef _GLIBCXX_EXPORT_TEMPLATE #include <bits/basic_ios.tcc> #endif diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index b3a8fdfb49e..d644d792bbe 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -37,17 +37,9 @@ // The current version of the C++ library in compressed ISO date format. #define __GLIBCXX__ 20030730 -// This is necessary until GCC supports separate template compilation. -#define _GLIBCXX_NO_TEMPLATE_EXPORT 1 - -// This is a hack around not having either pre-compiled headers or -// export compilation. If defined, the io, string, and valarray -// headers will include all the necessary bits. If not defined, the -// implementation optimizes the headers for the most commonly-used -// types. For the io library, this means that larger, out-of-line -// member functions are only declared, and definitions are not parsed -// by the compiler, but instead instantiated into the library binary. -#define _GLIBCXX_FULLY_COMPLIANT_HEADERS 1 +// Allow use of "export template." This is currently not a feature +// that g++ supports. +// #define _GLIBCXX_EXPORT_TEMPLATE 1 // Allow use of the GNU syntax extension, "extern template." This // extension is fully documented in the g++ manual, but in a nutshell, @@ -65,31 +57,6 @@ // Use corrected code from the committee library group's issues list. #define _GLIBCXX_RESOLVE_LIB_DEFECTS 1 -// Hopefully temporary workaround to autoconf/m4 issue with quoting '@'. -#define _GLIBCXX_AT_AT "@@" - -// In those parts of the standard C++ library that use a mutex instead -// of a spin-lock, we now unconditionally use GCC's gthr.h mutex -// abstraction layer. All support to directly map to various -// threading models has been removed. Note: gthr.h may well map to -// gthr-single.h which is a correct way to express no threads support -// in gcc. Support for the undocumented _NOTHREADS has been removed. - -// Default to the typically high-speed, pool-based allocator (as -// libstdc++-v2) instead of the malloc-based allocator (libstdc++-v3 -// snapshots). See libstdc++-v3/docs/html/17_intro/howto.html for -// details on why you don't want to override this setting. Ensure -// that threads are properly configured on your platform before -// assigning blame to the STL container-memory allocator. After doing -// so, please report any possible issues to libstdc++@gcc.gnu.org . -// Do not define __USE_MALLOC on the command line. Enforce it here: -#ifdef __USE_MALLOC -# error __USE_MALLOC should never be defined. Read the release notes. -#endif - -// The remainder of the prewritten config is mostly automatic; all the -// user hooks are listed above. - // Create a boolean flag to be used to determine if --fast-math is set. #ifdef __FAST_MATH__ # define _GLIBCXX_FAST_MATH 1 @@ -103,4 +70,5 @@ // for something else under certain OSes (see BADNAMES). #define __N(msgid) (msgid) -// End of prewritten config; the discovered settings follow. +// The remainder of the prewritten config is mostly automatic; all the +// user hooks are listed above: the discovered settings follow. diff --git a/libstdc++-v3/include/bits/valarray_array.h b/libstdc++-v3/include/bits/valarray_array.h index 3b14f1d3c1f..edaf2120eee 100644 --- a/libstdc++-v3/include/bits/valarray_array.h +++ b/libstdc++-v3/include/bits/valarray_array.h @@ -1,6 +1,7 @@ // The template and inlines for the -*- C++ -*- internal _Array helper class. -// Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +// Copyright (C) 1997, 1998, 1999, 2000, 2003 +// Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -615,16 +616,10 @@ _Array_augmented_##_Name (_Array<_Tp> __a, _Array<bool> __m, \ _DEFINE_ARRAY_FUNCTION(>>, __shift_right) #undef _DEFINE_VALARRAY_FUNCTION +} // namespace std -} // std:: - -#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT -# define export +#ifndef _GLIBCXX_EXPORT_TEMPLATE # include <bits/valarray_array.tcc> #endif #endif /* _ARRAY_H */ - -// Local Variables: -// mode:c++ -// End: diff --git a/libstdc++-v3/include/bits/valarray_array.tcc b/libstdc++-v3/include/bits/valarray_array.tcc index acf21a0fcd2..289001cf792 100644 --- a/libstdc++-v3/include/bits/valarray_array.tcc +++ b/libstdc++-v3/include/bits/valarray_array.tcc @@ -1,6 +1,6 @@ // The template and inlines for the -*- C++ -*- internal _Array helper class. -// Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. +// Copyright (C) 1997, 1998, 1999, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -34,128 +34,138 @@ namespace std { - -export template<typename _Tp> -void -__valarray_fill (_Array<_Tp> __a, size_t __n, _Array<bool> __m, const _Tp& __t) -{ - _Tp* __p = __a._M_data; - bool* __ok (__m._M_data); - for (size_t __i=0; __i<__n; ++__i, ++__ok, ++__p) { - while (! *__ok) { - ++__ok; - ++__p; - } - *__p = __t; + template<typename _Tp> + void + __valarray_fill(_Array<_Tp> __a, size_t __n, _Array<bool> __m, + const _Tp& __t) + { + _Tp* __p = __a._M_data; + bool* __ok (__m._M_data); + for (size_t __i=0; __i < __n; ++__i, ++__ok, ++__p) + { + while (!*__ok) + { + ++__ok; + ++__p; + } + *__p = __t; + } } -} - -export template<typename _Tp> -void -__valarray_copy(_Array<_Tp> __a, _Array<bool> __m, _Array<_Tp> __b, size_t __n) -{ - _Tp* __p (__a._M_data); - bool* __ok (__m._M_data); - for (_Tp* __q=__b._M_data; __q<__b._M_data+__n; ++__q, ++__ok, ++__p) { - while (! *__ok) { - ++__ok; - ++__p; - } - *__q = *__p; + + template<typename _Tp> + void + __valarray_copy(_Array<_Tp> __a, _Array<bool> __m, _Array<_Tp> __b, + size_t __n) + { + _Tp* __p (__a._M_data); + bool* __ok (__m._M_data); + for (_Tp* __q = __b._M_data; __q < __b._M_data + __n; + ++__q, ++__ok, ++__p) + { + while (! *__ok) + { + ++__ok; + ++__p; + } + *__q = *__p; + } } -} -export template<typename _Tp> -void -__valarray_copy (_Array<_Tp> __a, size_t __n, _Array<_Tp> __b, _Array<bool> __m) -{ - _Tp* __q (__b._M_data); - bool* __ok (__m._M_data); - for (_Tp* __p=__a._M_data; __p<__a._M_data+__n; ++__p, ++__ok, ++__q) { - while (! *__ok) { - ++__ok; - ++__q; - } - *__q = *__p; + template<typename _Tp> + void + __valarray_copy(_Array<_Tp> __a, size_t __n, _Array<_Tp> __b, + _Array<bool> __m) + { + _Tp* __q (__b._M_data); + bool* __ok (__m._M_data); + for (_Tp* __p = __a._M_data; __p < __a._M_data+__n; + ++__p, ++__ok, ++__q) + { + while (! *__ok) + { + ++__ok; + ++__q; + } + *__q = *__p; + } } -} -export template<typename _Tp, class _Dom> -void -__valarray_copy (const _Expr<_Dom, _Tp>& __e, size_t __n, _Array<_Tp> __a) -{ - _Tp* __p (__a._M_data); - for (size_t __i=0; __i<__n; ++__i, ++__p) *__p = __e[__i]; -} - -export template<typename _Tp, class _Dom> -void -__valarray_copy (const _Expr<_Dom, _Tp>& __e, size_t __n, - _Array<_Tp> __a, size_t __s) -{ - _Tp* __p (__a._M_data); - for (size_t __i=0; __i<__n; ++__i, __p+=__s) *__p = __e[__i]; -} - -export template<typename _Tp, class _Dom> -void -__valarray_copy (const _Expr<_Dom, _Tp>& __e, size_t __n, - _Array<_Tp> __a, _Array<size_t> __i) -{ - size_t* __j (__i._M_data); - for (size_t __k=0; __k<__n; ++__k, ++__j) __a._M_data[*__j] = __e[__k]; -} - -export template<typename _Tp, class _Dom> -void -__valarray_copy (const _Expr<_Dom, _Tp>& __e, size_t __n, - _Array<_Tp> __a, _Array<bool> __m) -{ - bool* __ok (__m._M_data); - _Tp* __p (__a._M_data); - for (size_t __i=0; __i<__n; ++__i, ++__ok, ++__p) { - while (! *__ok) { - ++__ok; - ++__p; - } - *__p = __e[__i]; + template<typename _Tp, class _Dom> + void + __valarray_copy(const _Expr<_Dom, _Tp>& __e, size_t __n, _Array<_Tp> __a) + { + _Tp* __p (__a._M_data); + for (size_t __i = 0; __i < __n; ++__i, ++__p) + *__p = __e[__i]; } -} - -export template<typename _Tp, class _Dom> -void -__valarray_copy_construct (const _Expr<_Dom, _Tp>& __e, size_t __n, - _Array<_Tp> __a) -{ - _Tp* __p (__a._M_data); - for (size_t __i=0; __i<__n; ++__i, ++__p) new (__p) _Tp(__e[__i]); -} - - -export template<typename _Tp> -void -__valarray_copy_construct (_Array<_Tp> __a, _Array<bool> __m, - _Array<_Tp> __b, size_t __n) -{ - _Tp* __p (__a._M_data); - bool* __ok (__m._M_data); - for (_Tp* __q=__b._M_data; __q<__b._M_data+__n; ++__q, ++__ok, ++__p) { - while (! *__ok) { - ++__ok; - ++__p; - } - new (__q) _Tp(*__p); + template<typename _Tp, class _Dom> + void + __valarray_copy(const _Expr<_Dom, _Tp>& __e, size_t __n, + _Array<_Tp> __a, size_t __s) + { + _Tp* __p (__a._M_data); + for (size_t __i = 0; __i < __n; ++__i, __p += __s) + *__p = __e[__i]; } -} + template<typename _Tp, class _Dom> + void + __valarray_copy(const _Expr<_Dom, _Tp>& __e, size_t __n, + _Array<_Tp> __a, _Array<size_t> __i) + { + size_t* __j (__i._M_data); + for (size_t __k = 0; __k < __n; ++__k, ++__j) + __a._M_data[*__j] = __e[__k]; + } + template<typename _Tp, class _Dom> + void + __valarray_copy(const _Expr<_Dom, _Tp>& __e, size_t __n, + _Array<_Tp> __a, _Array<bool> __m) + { + bool* __ok (__m._M_data); + _Tp* __p (__a._M_data); + for (size_t __i = 0; __i < __n; ++__i, ++__ok, ++__p) + { + while (! *__ok) + { + ++__ok; + ++__p; + } + *__p = __e[__i]; + } + } + + + template<typename _Tp, class _Dom> + void + __valarray_copy_construct(const _Expr<_Dom, _Tp>& __e, size_t __n, + _Array<_Tp> __a) + { + _Tp* __p (__a._M_data); + for (size_t __i = 0; __i < __n; ++__i, ++__p) + new (__p) _Tp(__e[__i]); + } -} // std:: + template<typename _Tp> + void + __valarray_copy_construct(_Array<_Tp> __a, _Array<bool> __m, + _Array<_Tp> __b, size_t __n) + { + _Tp* __p (__a._M_data); + bool* __ok (__m._M_data); + for (_Tp* __q = __b._M_data; __q < __b._M_data+__n; ++__q, ++__ok, ++__p) + { + while (! *__ok) + { + ++__ok; + ++__p; + } + new (__q) _Tp(*__p); + } + } +} // namespace std #endif /* _VALARRAY_ARRAY_TCC */ - -// Local Variables: -// mode:c++ -// End: diff --git a/libstdc++-v3/include/c/std_cctype.h b/libstdc++-v3/include/c/std_cctype.h index 1271e072a69..c007db9a9bd 100644 --- a/libstdc++-v3/include/c/std_cctype.h +++ b/libstdc++-v3/include/c/std_cctype.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 2000, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -31,8 +31,8 @@ // ISO C++ 14882: <ccytpe> // -#ifndef _CCTYPE -#define _CCTYPE 1 +#ifndef _GLIBCXX_CCTYPE +#define _GLIBCXX_CCTYPE 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c/std_cerrno.h b/libstdc++-v3/include/c/std_cerrno.h index 21c2701fa18..84e0e534337 100644 --- a/libstdc++-v3/include/c/std_cerrno.h +++ b/libstdc++-v3/include/c/std_cerrno.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 2000, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -40,8 +40,8 @@ * contained in the namespace @c std. */ -#ifndef _CERRNO -#define _CERRNO 1 +#ifndef _GLIBCXX_CERRNO +#define _GLIBCXX_CERRNO 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c/std_cfloat.h b/libstdc++-v3/include/c/std_cfloat.h index bcdb5f7bc29..e9319d302ad 100644 --- a/libstdc++-v3/include/c/std_cfloat.h +++ b/libstdc++-v3/include/c/std_cfloat.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 2000, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -31,8 +31,8 @@ // ISO C++ 14882: 18.2.2 Implementation properties: C library // -#ifndef _CFLOAT -#define _CFLOAT 1 +#ifndef _GLIBCXX_CFLOAT +#define _GLIBCXX_CFLOAT 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c/std_climits.h b/libstdc++-v3/include/c/std_climits.h index 659bed9caed..e1986f25a95 100644 --- a/libstdc++-v3/include/c/std_climits.h +++ b/libstdc++-v3/include/c/std_climits.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 2000, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -31,8 +31,8 @@ // ISO C++ 14882: 18.2.2 Implementation properties: C library // -#ifndef _CLIMITS -#define _CLIMITS 1 +#ifndef _GLIBCXX_CLIMITS +#define _GLIBCXX_CLIMITS 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c/std_clocale.h b/libstdc++-v3/include/c/std_clocale.h index 6ac30a77fd7..6aa937baf71 100644 --- a/libstdc++-v3/include/c/std_clocale.h +++ b/libstdc++-v3/include/c/std_clocale.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 2000, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -31,8 +31,8 @@ // ISO C++ 14882: 18.2.2 Implementation properties: C library // -#ifndef _CLOCALE -#define _CLOCALE 1 +#ifndef _GLIBCXX_CLOCALE +#define _GLIBCXX_CLOCALE 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c/std_cmath.h b/libstdc++-v3/include/c/std_cmath.h index 9d5d7c916f6..07d15ec9953 100644 --- a/libstdc++-v3/include/c/std_cmath.h +++ b/libstdc++-v3/include/c/std_cmath.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 2000, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -31,8 +31,8 @@ // ISO C++ 14882: 26.5 C library // -#ifndef _CMATH -#define _CMATH 1 +#ifndef _GLIBCXX_CMATH +#define _GLIBCXX_CMATH 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c/std_csetjmp.h b/libstdc++-v3/include/c/std_csetjmp.h index ad80a28ccb7..022753f4656 100644 --- a/libstdc++-v3/include/c/std_csetjmp.h +++ b/libstdc++-v3/include/c/std_csetjmp.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 2000, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -31,8 +31,8 @@ // ISO C++ 14882: 20.4.6 C library // -#ifndef _CSETJMP -#define _CSETJMP 1 +#ifndef _GLIBCXX_CSETJMP +#define _GLIBCXX_CSETJMP 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c/std_csignal.h b/libstdc++-v3/include/c/std_csignal.h index 6f2790c5b31..6fa96071d92 100644 --- a/libstdc++-v3/include/c/std_csignal.h +++ b/libstdc++-v3/include/c/std_csignal.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 2000, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -31,8 +31,8 @@ // ISO C++ 14882: 20.4.6 C library // -#ifndef _CSIGNAL -#define _CSIGNAL 1 +#ifndef _GLIBCXX_CSIGNAL +#define _GLIBCXX_CSIGNAL 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c/std_cstdarg.h b/libstdc++-v3/include/c/std_cstdarg.h index 5f66f906a72..0c236344ed8 100644 --- a/libstdc++-v3/include/c/std_cstdarg.h +++ b/libstdc++-v3/include/c/std_cstdarg.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 2000, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -31,8 +31,8 @@ // ISO C++ 14882: 20.4.6 C library // -#ifndef _CSTDARG -#define _CSTDARG 1 +#ifndef _GLIBCXX_CSTDARG +#define _GLIBCXX_CSTDARG 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c/std_cstddef.h b/libstdc++-v3/include/c/std_cstddef.h index b88944e61b7..4178ecf37ee 100644 --- a/libstdc++-v3/include/c/std_cstddef.h +++ b/libstdc++-v3/include/c/std_cstddef.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 2000, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -31,8 +31,8 @@ // ISO C++ 14882: 18.1 Types // -#ifndef _CSTDDEF -#define _CSTDDEF 1 +#ifndef _GLIBCXX_CSTDDEF +#define _GLIBCXX_CSTDDEF 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c/std_cstdio.h b/libstdc++-v3/include/c/std_cstdio.h index 0ef5787a7f5..fa04bc4518d 100644 --- a/libstdc++-v3/include/c/std_cstdio.h +++ b/libstdc++-v3/include/c/std_cstdio.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 2000, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -31,8 +31,8 @@ // ISO C++ 14882: 27.8.2 C Library files // -#ifndef _CSTDIO -#define _CSTDIO 1 +#ifndef _GLIBCXX_CSTDIO +#define _GLIBCXX_CSTDIO 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c/std_cstdlib.h b/libstdc++-v3/include/c/std_cstdlib.h index 1c34b36b601..47e972fb93b 100644 --- a/libstdc++-v3/include/c/std_cstdlib.h +++ b/libstdc++-v3/include/c/std_cstdlib.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 2000, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -31,8 +31,8 @@ // ISO C++ 14882: 20.4.6 C library // -#ifndef _CSTDLIB -#define _CSTDLIB 1 +#ifndef _GLIBCXX_CSTDLIB +#define _GLIBCXX_CSTDLIB 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c/std_cstring.h b/libstdc++-v3/include/c/std_cstring.h index e5c786d2973..72ee44f9255 100644 --- a/libstdc++-v3/include/c/std_cstring.h +++ b/libstdc++-v3/include/c/std_cstring.h @@ -31,8 +31,8 @@ // ISO C++ 14882: 20.4.6 C library // -#ifndef _CSTRING -#define _CSTRING 1 +#ifndef _GLIBCXX_CSTRING +#define _GLIBCXX_CSTRING 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c/std_ctime.h b/libstdc++-v3/include/c/std_ctime.h index 17d965afa90..197a1f8b864 100644 --- a/libstdc++-v3/include/c/std_ctime.h +++ b/libstdc++-v3/include/c/std_ctime.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 2000, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -31,8 +31,8 @@ // ISO C++ 14882: 20.5 Date and time // -#ifndef _CTIME -#define _CTIME 1 +#ifndef _GLIBCXX_CTIME +#define _GLIBCXX_CTIME 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c/std_cwchar.h b/libstdc++-v3/include/c/std_cwchar.h index 61126d96392..5b3451933e7 100644 --- a/libstdc++-v3/include/c/std_cwchar.h +++ b/libstdc++-v3/include/c/std_cwchar.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 2000, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -31,8 +31,8 @@ // ISO C++ 14882: 21.4 // -#ifndef _CWCHAR -#define _CWCHAR 1 +#ifndef _GLIBCXX_CWCHAR +#define _GLIBCXX_CWCHAR 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c/std_cwctype.h b/libstdc++-v3/include/c/std_cwctype.h index b94497bbe83..c01073a2e0a 100644 --- a/libstdc++-v3/include/c/std_cwctype.h +++ b/libstdc++-v3/include/c/std_cwctype.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 2000, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -31,8 +31,8 @@ // ISO C++ 14882: <cwctype> // -#ifndef _CWCTYPE -#define _CWCTYPE 1 +#ifndef _GLIBCXX_CWCTYPE +#define _GLIBCXX_CWCTYPE 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/cmath.tcc b/libstdc++-v3/include/c_std/cmath.tcc index 2132548e31f..a7bdf227b11 100644 --- a/libstdc++-v3/include/c_std/cmath.tcc +++ b/libstdc++-v3/include/c_std/cmath.tcc @@ -1,6 +1,6 @@ // -*- C++ -*- C math library. -// Copyright (C) 2000 Free Software Foundation, Inc. +// Copyright (C) 2000, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -34,7 +34,7 @@ namespace std { - export template<typename _Tp> + template<typename _Tp> _Tp __cmath_power(_Tp __x, unsigned int __n) { diff --git a/libstdc++-v3/include/c_std/std_cmath.h b/libstdc++-v3/include/c_std/std_cmath.h index d6c72e474f5..7edf7581f55 100644 --- a/libstdc++-v3/include/c_std/std_cmath.h +++ b/libstdc++-v3/include/c_std/std_cmath.h @@ -838,9 +838,8 @@ namespace std #endif /* _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC */ #endif -#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT -# define export -# include <bits/cmath.tcc> +#ifndef _GLIBCXX_EXPORT_TEMPLATE +# include <bits/cmath.tcc> #endif #endif diff --git a/libstdc++-v3/include/std/std_deque.h b/libstdc++-v3/include/std/std_deque.h index 7ebf9c71a5b..7200220975c 100644 --- a/libstdc++-v3/include/std/std_deque.h +++ b/libstdc++-v3/include/std/std_deque.h @@ -1,6 +1,6 @@ // <deque> -*- C++ -*- -// Copyright (C) 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -70,8 +70,8 @@ #include <bits/stl_uninitialized.h> #include <bits/stl_deque.h> -#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT -# include <bits/deque.tcc> +#ifndef _GLIBCXX_EXPORT_TEMPLATE +# include <bits/deque.tcc> #endif #endif /* _GLIBCXX_DEQUE */ diff --git a/libstdc++-v3/include/std/std_fstream.h b/libstdc++-v3/include/std/std_fstream.h index 4d1d655f1b1..2c19dc6bb56 100644 --- a/libstdc++-v3/include/std/std_fstream.h +++ b/libstdc++-v3/include/std/std_fstream.h @@ -820,10 +820,7 @@ namespace std }; } // namespace std -#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT -# define export -#endif -#ifdef _GLIBCXX_FULLY_COMPLIANT_HEADERS +#ifndef _GLIBCXX_EXPORT_TEMPLATE # include <bits/fstream.tcc> #endif diff --git a/libstdc++-v3/include/std/std_istream.h b/libstdc++-v3/include/std/std_istream.h index e27c4f6f7df..6e5efdc4bdb 100644 --- a/libstdc++-v3/include/std/std_istream.h +++ b/libstdc++-v3/include/std/std_istream.h @@ -768,10 +768,7 @@ namespace std ws(basic_istream<_CharT, _Traits>& __is); } // namespace std -#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT -# define export -#endif -#ifdef _GLIBCXX_FULLY_COMPLIANT_HEADERS +#ifndef _GLIBCXX_EXPORT_TEMPLATE # include <bits/istream.tcc> #endif diff --git a/libstdc++-v3/include/std/std_list.h b/libstdc++-v3/include/std/std_list.h index 5476dd018b8..f882bf7e5ee 100644 --- a/libstdc++-v3/include/std/std_list.h +++ b/libstdc++-v3/include/std/std_list.h @@ -1,6 +1,6 @@ // <list> -*- C++ -*- -// Copyright (C) 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -70,8 +70,8 @@ #include <bits/stl_uninitialized.h> #include <bits/stl_list.h> -#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT -# include <bits/list.tcc> +#ifndef _GLIBCXX_EXPORT_TEMPLATE +# include <bits/list.tcc> #endif #endif /* _GLIBCXX_LIST */ diff --git a/libstdc++-v3/include/std/std_ostream.h b/libstdc++-v3/include/std/std_ostream.h index 0fcf1b1d0d5..bfea017bfd9 100644 --- a/libstdc++-v3/include/std/std_ostream.h +++ b/libstdc++-v3/include/std/std_ostream.h @@ -541,10 +541,7 @@ namespace std } // namespace std -#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT -# define export -#endif -#ifdef _GLIBCXX_FULLY_COMPLIANT_HEADERS +#ifndef _GLIBCXX_EXPORT_TEMPLATE # include <bits/ostream.tcc> #endif diff --git a/libstdc++-v3/include/std/std_queue.h b/libstdc++-v3/include/std/std_queue.h index a794fe16e9b..e2e0b845e45 100644 --- a/libstdc++-v3/include/std/std_queue.h +++ b/libstdc++-v3/include/std/std_queue.h @@ -1,6 +1,6 @@ // <queue> -*- C++ -*- -// Copyright (C) 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -74,7 +74,7 @@ #include <bits/stl_function.h> #include <bits/stl_queue.h> -#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT +#ifndef _GLIBCXX_EXPORT_TEMPLATE # include <bits/deque.tcc> # include <bits/vector.tcc> #endif diff --git a/libstdc++-v3/include/std/std_sstream.h b/libstdc++-v3/include/std/std_sstream.h index 5db194249e1..c856eb03101 100644 --- a/libstdc++-v3/include/std/std_sstream.h +++ b/libstdc++-v3/include/std/std_sstream.h @@ -641,10 +641,7 @@ namespace std }; } // namespace std -#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT -# define export -#endif -#ifdef _GLIBCXX_FULLY_COMPLIANT_HEADERS +#ifndef _GLIBCXX_EXPORT_TEMPLATE # include <bits/sstream.tcc> #endif diff --git a/libstdc++-v3/include/std/std_stack.h b/libstdc++-v3/include/std/std_stack.h index 5ba8b2ed33e..80178528516 100644 --- a/libstdc++-v3/include/std/std_stack.h +++ b/libstdc++-v3/include/std/std_stack.h @@ -1,6 +1,6 @@ // <stack> -*- C++ -*- -// Copyright (C) 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -70,8 +70,8 @@ #include <bits/stl_deque.h> #include <bits/stl_stack.h> -#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT -# include <bits/deque.tcc> +#ifndef _GLIBCXX_EXPORT_TEMPLATE +# include <bits/deque.tcc> #endif #endif /* _GLIBCXX_STACK */ diff --git a/libstdc++-v3/include/std/std_streambuf.h b/libstdc++-v3/include/std/std_streambuf.h index ad639d3b1cd..3c144987306 100644 --- a/libstdc++-v3/include/std/std_streambuf.h +++ b/libstdc++-v3/include/std/std_streambuf.h @@ -777,11 +777,8 @@ namespace std }; } // namespace std -#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT -# define export -#endif -#ifdef _GLIBCXX_FULLY_COMPLIANT_HEADERS -#include <bits/streambuf.tcc> +#ifndef _GLIBCXX_EXPORT_TEMPLATE +# include <bits/streambuf.tcc> #endif #endif /* _GLIBCXX_STREAMBUF */ diff --git a/libstdc++-v3/include/std/std_string.h b/libstdc++-v3/include/std/std_string.h index 6c60a8493b5..2b15658c768 100644 --- a/libstdc++-v3/include/std/std_string.h +++ b/libstdc++-v3/include/std/std_string.h @@ -1,6 +1,6 @@ // Components for manipulating sequences of characters -*- C++ -*- -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -52,7 +52,7 @@ #include <bits/stl_function.h> // For less #include <bits/basic_string.h> -#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT +#ifndef _GLIBCXX_EXPORT_TEMPLATE # include <algorithm> // for find_if # include <bits/basic_string.tcc> #endif diff --git a/libstdc++-v3/include/std/std_vector.h b/libstdc++-v3/include/std/std_vector.h index 8802b455286..02cf1229148 100644 --- a/libstdc++-v3/include/std/std_vector.h +++ b/libstdc++-v3/include/std/std_vector.h @@ -1,6 +1,6 @@ // <vector> -*- C++ -*- -// Copyright (C) 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -71,8 +71,8 @@ #include <bits/stl_vector.h> #include <bits/stl_bvector.h> -#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT -# include <bits/vector.tcc> +#ifndef _GLIBCXX_EXPORT_TEMPLATE +# include <bits/vector.tcc> #endif #endif /* _GLIBCXX_VECTOR */ |