From e1e0016d0d1995123526b8a248d388c06644541b Mon Sep 17 00:00:00 2001 From: bkoz Date: Fri, 4 Jan 2002 21:27:36 +0000 Subject: [PATCH] 2002-01-04 Benjamin Kosnik * include/Makefile.am (std_headers): Remove cXXX from list. (c_base_srcdir): No bits subdirectory. (c_base_builddir): Same. (c_base_headers): Adjust names, add ciso646. (bits_headers): Remove std_xxx.h headers. * include/Makefile.in: Regenerate. * include/ext/iterator: Adjust includes. * include/ext/ropeimpl.h: Same. * include/ext/stl_hash_fun.h: Same. * include/ext/algorithm: Same. * include/backward/bvector.h: Adjust includes. * include/backward/vector.h: Same. * include/backward/strstream: Same. * include/backward/streambuf.h: Same. * include/backward/stack.h: Same. * include/backward/set.h: Same. * include/backward/queue.h: Same. * include/backward/multiset.h: Same. * include/backward/multimap.h: Same. * include/backward/map.h: Same. * include/backward/list.h: Same. * include/backward/iterator.h: Same. * include/backward/iostream.h: Same. * include/backward/iomanip.h: Same. * include/backward/fstream.h: Same. * include/backward/deque.h: Same. * include/backward/complex.h: Same. * include/bits/std_algorithm.h: Move to... * include/std/algorithm: ...here. * include/bits/std_iosfwd.h, std_locale.h, std_stack.h, std_bitset.h, std_ios.h, std_map.h, std_stdexcept.h, std_complex.h, std_iostream.h, std_memory.h, std_streambuf.h, std_deque.h, std_istream.h, std_numeric.h, std_string.h, std_fstream.h, std_ostream.h, std_utility.h, std_iterator.h, std_queue.h, std_valarray.h, std_functional.h, std_limits.h, std_set.h, std_vector.h, std_iomanip.h, std_list.h, std_sstream.h: Same. * include/c_std/bits/std_cassert.h: Move to... * include/c_std/cassert: Here. * include/c_std/std_cctype.h, std_cerrno.h, std_cfloat.h, std_climits.h, std_clocale.h, std_cmath.h, std_csetjmp.h, std_csignal.h, std_cstdarg.h, std_cstddef.h, std_cstdio.h, std_cstdlib.h, std_cstring.h, std_ctime.h, std_cwchar.h, std_cwctype.h: Same. * include/c_std/cmath: Adjust cmath.tcc include. * include/c_std/cstdlib: Adjust includes. * include/c_std/cwchar: Same. * include/c_std/ctime: Same. * include/c_std/cstring: Same. * include/c_std/cstdio: Same. * include/c_std/bits: Remove directory. * include/c/bits/std_cassert.h: Move to... * include/c/cassert: Here. * include/c/std_cctype.h, std_cerrno.h, std_cfloat.h, std_climits.h, std_clocale.h, std_cmath.h, std_csetjmp.h, std_csignal.h, std_cstdarg.h, std_cstddef.h, std_cstdio.h, std_cstdlib.h, std_cstring.h, std_ctime.h, std_cwchar.h, std_cwctype.h: Same. * include/c/bits: Remove directory. * include/std/cwctype: Remove. * include/std/cwchar: Remove. * include/std/ctime: Remove. * include/std/cstring: Remove. * include/std/cstdlib: Remove. * include/std/cstdio: Remove. * include/std/cstddef: Remove. * include/std/cstdarg: Remove. * include/std/csignal: Remove. * include/std/csetjmp: Remove. * include/std/cmath: Remove. * include/std/clocale: Remove. * include/std/climits: Remove. * include/std/ciso646: Remove. * include/std/cfloat: Remove. * include/std/cerrno: Remove. * include/std/cctype: Remove. * include/std/cassert: Remove. * include/bits/fpos.h: Adjust includes, removing files and subsituting <.xxx> * include/bits/valarray_array.h: Same. * include/bits/stl_uninitialized.h: Same. * include/bits/stl_alloc.h: Same. * include/bits/stl_algobase.h: Same. * include/bits/sstream.tcc: Same. * include/bits/pthread_allocimpl.h: Same. * include/bits/ostream.tcc: Same. * include/bits/localefwd.h: Same. * include/bits/locale_facets.tcc: Same. * include/bits/locale_facets.h: Same. * include/bits/istream.tcc: Same. * include/bits/char_traits.h: Same. * include/bits/boost_concept_check.h: Same. * include/bits/basic_file.h: Same. * include/std/bitset: Same. * include/std/complex: Same. * include/std/fstream: Same. * include/std/functional: Same. * include/std/ios: Same. * include/std/iostream: Same. * include/std/ostream: Same. * include/std/sstream: Same. * include/std/streambuf: Same. * include/std/string: Same. * include/std/iterator: Same. * include/std/valarray: Same. * src/ios.cc: Adjust includes. * src/valarray-inst.cc: Same. * src/string-inst.cc: Same. * src/stl-inst.cc: Same. * src/stdexcept.cc: Same. * src/misc-inst.cc: Same. * src/localename.cc: Same. * src/locale-inst.cc: Same. * src/locale.cc: Same. * src/limits.cc: Same. * src/concept-inst.cc: Same. * src/complex_io.cc: Same. * src/codecvt.cc: Same. * src/bitset.cc: Same. * src/cmath.cc: Same. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@48544 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 133 +++++++++- libstdc++-v3/configure | 59 +++-- libstdc++-v3/include/Makefile.am | 88 ++----- libstdc++-v3/include/Makefile.in | 268 +++++++++------------ libstdc++-v3/include/backward/bvector.h | 4 +- libstdc++-v3/include/backward/complex.h | 2 +- libstdc++-v3/include/backward/deque.h | 2 +- libstdc++-v3/include/backward/fstream.h | 2 +- libstdc++-v3/include/backward/iomanip.h | 2 +- libstdc++-v3/include/backward/iostream.h | 2 +- libstdc++-v3/include/backward/iterator.h | 2 +- libstdc++-v3/include/backward/list.h | 2 +- libstdc++-v3/include/backward/map.h | 2 +- libstdc++-v3/include/backward/multimap.h | 2 +- libstdc++-v3/include/backward/multiset.h | 2 +- libstdc++-v3/include/backward/queue.h | 2 +- libstdc++-v3/include/backward/set.h | 2 +- libstdc++-v3/include/backward/stack.h | 2 +- libstdc++-v3/include/backward/streambuf.h | 2 +- libstdc++-v3/include/backward/strstream | 10 +- libstdc++-v3/include/backward/vector.h | 2 +- libstdc++-v3/include/bits/basic_file.h | 2 +- libstdc++-v3/include/bits/boost_concept_check.h | 2 +- libstdc++-v3/include/bits/char_traits.h | 2 +- libstdc++-v3/include/bits/fpos.h | 5 +- libstdc++-v3/include/bits/istream.tcc | 4 +- libstdc++-v3/include/bits/locale_facets.h | 6 +- libstdc++-v3/include/bits/locale_facets.tcc | 16 +- libstdc++-v3/include/bits/localefwd.h | 6 +- libstdc++-v3/include/bits/ostream.tcc | 2 +- libstdc++-v3/include/bits/pthread_allocimpl.h | 2 +- libstdc++-v3/include/bits/sstream.tcc | 2 +- libstdc++-v3/include/bits/std_ios.h | 54 ----- libstdc++-v3/include/bits/std_locale.h | 52 ---- libstdc++-v3/include/bits/stl_algobase.h | 16 +- libstdc++-v3/include/bits/stl_alloc.h | 11 +- libstdc++-v3/include/bits/stl_uninitialized.h | 2 +- libstdc++-v3/include/bits/valarray_array.h | 4 +- .../include/c/{bits/std_cassert.h => cassert} | 0 .../include/c/{bits/std_cctype.h => cctype} | 0 .../include/c/{bits/std_cerrno.h => cerrno} | 0 .../include/c/{bits/std_cfloat.h => cfloat} | 0 libstdc++-v3/include/{std => c}/ciso646 | 0 .../include/c/{bits/std_climits.h => climits} | 0 .../include/c/{bits/std_clocale.h => clocale} | 0 libstdc++-v3/include/c/{bits/std_cmath.h => cmath} | 0 .../include/c/{bits/std_csetjmp.h => csetjmp} | 0 .../include/c/{bits/std_csignal.h => csignal} | 0 .../include/c/{bits/std_cstdarg.h => cstdarg} | 0 .../include/c/{bits/std_cstddef.h => cstddef} | 0 .../include/c/{bits/std_cstdio.h => cstdio} | 0 .../include/c/{bits/std_cstdlib.h => cstdlib} | 0 .../include/c/{bits/std_cstring.h => cstring} | 0 libstdc++-v3/include/c/{bits/std_ctime.h => ctime} | 0 .../include/c/{bits/std_cwchar.h => cwchar} | 0 .../include/c/{bits/std_cwctype.h => cwctype} | 0 .../include/c_std/{bits/std_cassert.h => cassert} | 0 .../include/c_std/{bits/std_cctype.h => cctype} | 0 .../include/c_std/{bits/std_cerrno.h => cerrno} | 0 .../include/c_std/{bits/std_cfloat.h => cfloat} | 0 libstdc++-v3/include/{std => c_std}/ciso646 | 0 .../include/c_std/{bits/std_climits.h => climits} | 0 .../include/c_std/{bits/std_clocale.h => clocale} | 0 .../include/c_std/{bits/std_cmath.h => cmath} | 2 +- libstdc++-v3/include/c_std/{bits => }/cmath.tcc | 0 .../include/c_std/{bits/std_csetjmp.h => csetjmp} | 0 .../include/c_std/{bits/std_csignal.h => csignal} | 0 .../include/c_std/{bits/std_cstdarg.h => cstdarg} | 0 .../include/c_std/{bits/std_cstddef.h => cstddef} | 0 .../include/c_std/{bits/std_cstdio.h => cstdio} | 2 +- .../include/c_std/{bits/std_cstdlib.h => cstdlib} | 2 +- .../include/c_std/{bits/std_cstring.h => cstring} | 2 +- .../include/c_std/{bits/std_ctime.h => ctime} | 2 +- .../include/c_std/{bits/std_cwchar.h => cwchar} | 4 +- .../include/c_std/{bits/std_cwctype.h => cwctype} | 0 libstdc++-v3/include/ext/algorithm | 2 +- libstdc++-v3/include/ext/functional | 2 +- libstdc++-v3/include/ext/iterator | 2 +- libstdc++-v3/include/ext/memory | 2 +- libstdc++-v3/include/ext/numeric | 2 +- libstdc++-v3/include/ext/ropeimpl.h | 4 +- libstdc++-v3/include/ext/stl_hash_fun.h | 2 +- .../{bits/std_algorithm.h => std/algorithm} | 0 .../include/{bits/std_bitset.h => std/bitset} | 12 +- libstdc++-v3/include/std/cassert | 41 ---- libstdc++-v3/include/std/cctype | 41 ---- libstdc++-v3/include/std/cerrno | 41 ---- libstdc++-v3/include/std/cfloat | 41 ---- libstdc++-v3/include/std/climits | 41 ---- libstdc++-v3/include/std/clocale | 41 ---- libstdc++-v3/include/std/cmath | 41 ---- .../include/{bits/std_complex.h => std/complex} | 4 +- libstdc++-v3/include/std/csetjmp | 41 ---- libstdc++-v3/include/std/csignal | 41 ---- libstdc++-v3/include/std/cstdarg | 41 ---- libstdc++-v3/include/std/cstddef | 41 ---- libstdc++-v3/include/std/cstdio | 41 ---- libstdc++-v3/include/std/cstdlib | 41 ---- libstdc++-v3/include/std/cstring | 41 ---- libstdc++-v3/include/std/ctime | 41 ---- libstdc++-v3/include/std/cwchar | 41 ---- libstdc++-v3/include/std/cwctype | 41 ---- .../include/{bits/std_deque.h => std/deque} | 0 .../include/{bits/std_fstream.h => std/fstream} | 6 +- .../{bits/std_functional.h => std/functional} | 2 +- .../include/{bits/std_iomanip.h => std/iomanip} | 4 +- libstdc++-v3/include/std/ios | 31 ++- .../include/{bits/std_iosfwd.h => std/iosfwd} | 0 .../include/{bits/std_iostream.h => std/iostream} | 4 +- .../include/{bits/std_istream.h => std/istream} | 4 +- .../include/{bits/std_iterator.h => std/iterator} | 6 +- .../include/{bits/std_limits.h => std/limits} | 0 libstdc++-v3/include/{bits/std_list.h => std/list} | 0 libstdc++-v3/include/std/locale | 27 ++- libstdc++-v3/include/{bits/std_map.h => std/map} | 0 .../include/{bits/std_memory.h => std/memory} | 0 .../include/{bits/std_numeric.h => std/numeric} | 4 +- .../include/{bits/std_ostream.h => std/ostream} | 2 +- .../include/{bits/std_queue.h => std/queue} | 0 libstdc++-v3/include/{bits/std_set.h => std/set} | 0 .../include/{bits/std_sstream.h => std/sstream} | 4 +- .../include/{bits/std_stack.h => std/stack} | 0 .../{bits/std_stdexcept.h => std/stdexcept} | 0 .../{bits/std_streambuf.h => std/streambuf} | 4 +- .../include/{bits/std_string.h => std/string} | 6 +- .../include/{bits/std_utility.h => std/utility} | 0 .../include/{bits/std_valarray.h => std/valarray} | 12 +- .../include/{bits/std_vector.h => std/vector} | 0 libstdc++-v3/src/bitset.cc | 2 +- libstdc++-v3/src/cmath.cc | 3 +- libstdc++-v3/src/codecvt.cc | 2 +- libstdc++-v3/src/complex_io.cc | 5 +- libstdc++-v3/src/concept-inst.cc | 9 +- libstdc++-v3/src/ios.cc | 8 +- libstdc++-v3/src/limits.cc | 2 +- libstdc++-v3/src/locale-inst.cc | 19 +- libstdc++-v3/src/locale.cc | 24 +- libstdc++-v3/src/localename.cc | 10 +- libstdc++-v3/src/misc-inst.cc | 26 +- libstdc++-v3/src/stdexcept.cc | 4 +- libstdc++-v3/src/stl-inst.cc | 8 +- libstdc++-v3/src/string-inst.cc | 2 +- libstdc++-v3/src/valarray-inst.cc | 2 +- 143 files changed, 515 insertions(+), 1250 deletions(-) delete mode 100644 libstdc++-v3/include/bits/std_ios.h delete mode 100644 libstdc++-v3/include/bits/std_locale.h rename libstdc++-v3/include/c/{bits/std_cassert.h => cassert} (100%) rename libstdc++-v3/include/c/{bits/std_cctype.h => cctype} (100%) rename libstdc++-v3/include/c/{bits/std_cerrno.h => cerrno} (100%) rename libstdc++-v3/include/c/{bits/std_cfloat.h => cfloat} (100%) copy libstdc++-v3/include/{std => c}/ciso646 (100%) rename libstdc++-v3/include/c/{bits/std_climits.h => climits} (100%) rename libstdc++-v3/include/c/{bits/std_clocale.h => clocale} (100%) rename libstdc++-v3/include/c/{bits/std_cmath.h => cmath} (100%) rename libstdc++-v3/include/c/{bits/std_csetjmp.h => csetjmp} (100%) rename libstdc++-v3/include/c/{bits/std_csignal.h => csignal} (100%) rename libstdc++-v3/include/c/{bits/std_cstdarg.h => cstdarg} (100%) rename libstdc++-v3/include/c/{bits/std_cstddef.h => cstddef} (100%) rename libstdc++-v3/include/c/{bits/std_cstdio.h => cstdio} (100%) rename libstdc++-v3/include/c/{bits/std_cstdlib.h => cstdlib} (100%) rename libstdc++-v3/include/c/{bits/std_cstring.h => cstring} (100%) rename libstdc++-v3/include/c/{bits/std_ctime.h => ctime} (100%) rename libstdc++-v3/include/c/{bits/std_cwchar.h => cwchar} (100%) rename libstdc++-v3/include/c/{bits/std_cwctype.h => cwctype} (100%) rename libstdc++-v3/include/c_std/{bits/std_cassert.h => cassert} (100%) rename libstdc++-v3/include/c_std/{bits/std_cctype.h => cctype} (100%) rename libstdc++-v3/include/c_std/{bits/std_cerrno.h => cerrno} (100%) rename libstdc++-v3/include/c_std/{bits/std_cfloat.h => cfloat} (100%) rename libstdc++-v3/include/{std => c_std}/ciso646 (100%) rename libstdc++-v3/include/c_std/{bits/std_climits.h => climits} (100%) rename libstdc++-v3/include/c_std/{bits/std_clocale.h => clocale} (100%) rename libstdc++-v3/include/c_std/{bits/std_cmath.h => cmath} (99%) rename libstdc++-v3/include/c_std/{bits => }/cmath.tcc (100%) rename libstdc++-v3/include/c_std/{bits/std_csetjmp.h => csetjmp} (100%) rename libstdc++-v3/include/c_std/{bits/std_csignal.h => csignal} (100%) rename libstdc++-v3/include/c_std/{bits/std_cstdarg.h => cstdarg} (100%) rename libstdc++-v3/include/c_std/{bits/std_cstddef.h => cstddef} (100%) rename libstdc++-v3/include/c_std/{bits/std_cstdio.h => cstdio} (99%) rename libstdc++-v3/include/c_std/{bits/std_cstdlib.h => cstdlib} (99%) rename libstdc++-v3/include/c_std/{bits/std_cstring.h => cstring} (99%) rename libstdc++-v3/include/c_std/{bits/std_ctime.h => ctime} (98%) rename libstdc++-v3/include/c_std/{bits/std_cwchar.h => cwchar} (98%) rename libstdc++-v3/include/c_std/{bits/std_cwctype.h => cwctype} (100%) rename libstdc++-v3/include/{bits/std_algorithm.h => std/algorithm} (100%) rename libstdc++-v3/include/{bits/std_bitset.h => std/bitset} (98%) delete mode 100644 libstdc++-v3/include/std/cassert delete mode 100644 libstdc++-v3/include/std/cctype delete mode 100644 libstdc++-v3/include/std/cerrno delete mode 100644 libstdc++-v3/include/std/cfloat delete mode 100644 libstdc++-v3/include/std/climits delete mode 100644 libstdc++-v3/include/std/clocale delete mode 100644 libstdc++-v3/include/std/cmath rename libstdc++-v3/include/{bits/std_complex.h => std/complex} (99%) delete mode 100644 libstdc++-v3/include/std/csetjmp delete mode 100644 libstdc++-v3/include/std/csignal delete mode 100644 libstdc++-v3/include/std/cstdarg delete mode 100644 libstdc++-v3/include/std/cstddef delete mode 100644 libstdc++-v3/include/std/cstdio delete mode 100644 libstdc++-v3/include/std/cstdlib delete mode 100644 libstdc++-v3/include/std/cstring delete mode 100644 libstdc++-v3/include/std/ctime delete mode 100644 libstdc++-v3/include/std/cwchar delete mode 100644 libstdc++-v3/include/std/cwctype rename libstdc++-v3/include/{bits/std_deque.h => std/deque} (100%) rename libstdc++-v3/include/{bits/std_fstream.h => std/fstream} (99%) rename libstdc++-v3/include/{bits/std_functional.h => std/functional} (98%) rename libstdc++-v3/include/{bits/std_iomanip.h => std/iomanip} (98%) rename libstdc++-v3/include/{bits/std_iosfwd.h => std/iosfwd} (100%) rename libstdc++-v3/include/{bits/std_iostream.h => std/iostream} (97%) rename libstdc++-v3/include/{bits/std_istream.h => std/istream} (99%) rename libstdc++-v3/include/{bits/std_iterator.h => std/iterator} (97%) rename libstdc++-v3/include/{bits/std_limits.h => std/limits} (100%) rename libstdc++-v3/include/{bits/std_list.h => std/list} (100%) rename libstdc++-v3/include/{bits/std_map.h => std/map} (100%) rename libstdc++-v3/include/{bits/std_memory.h => std/memory} (100%) rename libstdc++-v3/include/{bits/std_numeric.h => std/numeric} (97%) rename libstdc++-v3/include/{bits/std_ostream.h => std/ostream} (99%) rename libstdc++-v3/include/{bits/std_queue.h => std/queue} (100%) rename libstdc++-v3/include/{bits/std_set.h => std/set} (100%) rename libstdc++-v3/include/{bits/std_sstream.h => std/sstream} (99%) rename libstdc++-v3/include/{bits/std_stack.h => std/stack} (100%) rename libstdc++-v3/include/{bits/std_stdexcept.h => std/stdexcept} (100%) rename libstdc++-v3/include/{bits/std_streambuf.h => std/streambuf} (99%) rename libstdc++-v3/include/{bits/std_string.h => std/string} (92%) rename libstdc++-v3/include/{bits/std_utility.h => std/utility} (100%) rename libstdc++-v3/include/{bits/std_valarray.h => std/valarray} (99%) rename libstdc++-v3/include/{bits/std_vector.h => std/vector} (100%) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 776bbfe6e52..5dbf8df76b7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,134 @@ +2002-01-04 Benjamin Kosnik + + * include/Makefile.am (std_headers): Remove cXXX from list. + (c_base_srcdir): No bits subdirectory. + (c_base_builddir): Same. + (c_base_headers): Adjust names, add ciso646. + (bits_headers): Remove std_xxx.h headers. + * include/Makefile.in: Regenerate. + + * include/ext/iterator: Adjust includes. + * include/ext/ropeimpl.h: Same. + * include/ext/stl_hash_fun.h: Same. + * include/ext/algorithm: Same. + + * include/backward/bvector.h: Adjust includes. + * include/backward/vector.h: Same. + * include/backward/strstream: Same. + * include/backward/streambuf.h: Same. + * include/backward/stack.h: Same. + * include/backward/set.h: Same. + * include/backward/queue.h: Same. + * include/backward/multiset.h: Same. + * include/backward/multimap.h: Same. + * include/backward/map.h: Same. + * include/backward/list.h: Same. + * include/backward/iterator.h: Same. + * include/backward/iostream.h: Same. + * include/backward/iomanip.h: Same. + * include/backward/fstream.h: Same. + * include/backward/deque.h: Same. + * include/backward/complex.h: Same. + + * include/bits/std_algorithm.h: Move to... + * include/std/algorithm: ...here. + * include/bits/std_iosfwd.h, std_locale.h, std_stack.h, + std_bitset.h, std_ios.h, std_map.h, std_stdexcept.h, + std_complex.h, std_iostream.h, std_memory.h, std_streambuf.h, + std_deque.h, std_istream.h, std_numeric.h, std_string.h, + std_fstream.h, std_ostream.h, std_utility.h, std_iterator.h, + std_queue.h, std_valarray.h, std_functional.h, std_limits.h, + std_set.h, std_vector.h, std_iomanip.h, std_list.h, std_sstream.h: + Same. + + * include/c_std/bits/std_cassert.h: Move to... + * include/c_std/cassert: Here. + * include/c_std/std_cctype.h, std_cerrno.h, std_cfloat.h, + std_climits.h, std_clocale.h, std_cmath.h, std_csetjmp.h, + std_csignal.h, std_cstdarg.h, std_cstddef.h, std_cstdio.h, + std_cstdlib.h, std_cstring.h, std_ctime.h, std_cwchar.h, + std_cwctype.h: Same. + * include/c_std/cmath: Adjust cmath.tcc include. + * include/c_std/cstdlib: Adjust includes. + * include/c_std/cwchar: Same. + * include/c_std/ctime: Same. + * include/c_std/cstring: Same. + * include/c_std/cstdio: Same. + * include/c_std/bits: Remove directory. + + * include/c/bits/std_cassert.h: Move to... + * include/c/cassert: Here. + * include/c/std_cctype.h, std_cerrno.h, std_cfloat.h, + std_climits.h, std_clocale.h, std_cmath.h, std_csetjmp.h, + std_csignal.h, std_cstdarg.h, std_cstddef.h, std_cstdio.h, + std_cstdlib.h, std_cstring.h, std_ctime.h, std_cwchar.h, + std_cwctype.h: Same. + * include/c/bits: Remove directory. + + * include/std/cwctype: Remove. + * include/std/cwchar: Remove. + * include/std/ctime: Remove. + * include/std/cstring: Remove. + * include/std/cstdlib: Remove. + * include/std/cstdio: Remove. + * include/std/cstddef: Remove. + * include/std/cstdarg: Remove. + * include/std/csignal: Remove. + * include/std/csetjmp: Remove. + * include/std/cmath: Remove. + * include/std/clocale: Remove. + * include/std/climits: Remove. + * include/std/ciso646: Remove. + * include/std/cfloat: Remove. + * include/std/cerrno: Remove. + * include/std/cctype: Remove. + * include/std/cassert: Remove. + + * include/bits/fpos.h: Adjust includes, removing + files and subsituting <.xxx> + * include/bits/valarray_array.h: Same. + * include/bits/stl_uninitialized.h: Same. + * include/bits/stl_alloc.h: Same. + * include/bits/stl_algobase.h: Same. + * include/bits/sstream.tcc: Same. + * include/bits/pthread_allocimpl.h: Same. + * include/bits/ostream.tcc: Same. + * include/bits/localefwd.h: Same. + * include/bits/locale_facets.tcc: Same. + * include/bits/locale_facets.h: Same. + * include/bits/istream.tcc: Same. + * include/bits/char_traits.h: Same. + * include/bits/boost_concept_check.h: Same. + * include/bits/basic_file.h: Same. + * include/std/bitset: Same. + * include/std/complex: Same. + * include/std/fstream: Same. + * include/std/functional: Same. + * include/std/ios: Same. + * include/std/iostream: Same. + * include/std/ostream: Same. + * include/std/sstream: Same. + * include/std/streambuf: Same. + * include/std/string: Same. + * include/std/iterator: Same. + * include/std/valarray: Same. + + * src/ios.cc: Adjust includes. + * src/valarray-inst.cc: Same. + * src/string-inst.cc: Same. + * src/stl-inst.cc: Same. + * src/stdexcept.cc: Same. + * src/misc-inst.cc: Same. + * src/localename.cc: Same. + * src/locale-inst.cc: Same. + * src/locale.cc: Same. + * src/limits.cc: Same. + * src/concept-inst.cc: Same. + * src/complex_io.cc: Same. + * src/codecvt.cc: Same. + * src/bitset.cc: Same. + * src/cmath.cc: Same. + 2002-01-04 Paolo Carlini * include/bits/stl_tree.h (rb_tree): Move to... @@ -30,7 +161,7 @@ * include/backward/function.h: Include , tweak. * include/ext/ropeimpl.h: Include . -Thu Jan 3 11:05:41 2002 Jeffrey A Law (law@redhat.com) +2002-01-03 Jeffrey A Law * config/os/hpux/bits/os_defines.h: Prefix __strtoll and __strtoull declarations with __extension__. diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 21e07d4e9be..d07776b3da9 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -18520,7 +18520,7 @@ else fi rm -f conftest* - for ac_hdr in unistd.h + for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -18652,11 +18652,24 @@ else #include #include +#if HAVE_SYS_TYPES_H +# include +#endif + +#if HAVE_STDLIB_H +# include +#endif + +#if HAVE_SYS_STAT_H +# include +#endif + +#if HAVE_UNISTD_H +# include +#endif + /* This mess was copied from the GNU getpagesize.h. */ #ifndef HAVE_GETPAGESIZE -# ifdef HAVE_UNISTD_H -# include -# endif /* Assume that all systems that can run configure have sys/param.h. */ # ifndef HAVE_SYS_PARAM_H @@ -18764,7 +18777,7 @@ main() } EOF -if { (eval echo configure:18768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:18781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -18795,17 +18808,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:18799: checking for $ac_hdr" >&5 +echo "configure:18812: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:18809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -18838,7 +18851,7 @@ done # Can't do these in a loop, else the resulting syntax is wrong. cat > conftest.$ac_ext < #include @@ -18847,7 +18860,7 @@ int main() { int f = RLIMIT_DATA ; ; return 0; } EOF -if { (eval echo configure:18851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_mresult=1 else @@ -18864,7 +18877,7 @@ EOF cat > conftest.$ac_ext < #include @@ -18873,7 +18886,7 @@ int main() { int f = RLIMIT_RSS ; ; return 0; } EOF -if { (eval echo configure:18877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_mresult=1 else @@ -18890,7 +18903,7 @@ EOF cat > conftest.$ac_ext < #include @@ -18899,7 +18912,7 @@ int main() { int f = RLIMIT_VMEM ; ; return 0; } EOF -if { (eval echo configure:18903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_mresult=1 else @@ -18916,7 +18929,7 @@ EOF cat > conftest.$ac_ext < #include @@ -18925,7 +18938,7 @@ int main() { int f = RLIMIT_AS ; ; return 0; } EOF -if { (eval echo configure:18929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_mresult=1 else @@ -18947,7 +18960,7 @@ EOF else cat > conftest.$ac_ext < #include @@ -18956,7 +18969,7 @@ int main() { struct rlimit r; setrlimit(0, &r); ; return 0; } EOF -if { (eval echo configure:18960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_setrlimit=yes else @@ -18972,7 +18985,7 @@ fi fi echo $ac_n "checking for testsuite memory limit support""... $ac_c" 1>&6 -echo "configure:18976: checking for testsuite memory limit support" >&5 +echo "configure:18989: checking for testsuite memory limit support" >&5 if test $setrlimit_have_headers = yes && test $ac_setrlimit = yes; then ac_mem_limits=yes cat >> confdefs.h <<\EOF @@ -19074,13 +19087,13 @@ glibcpp_toolexeclibdir=no glibcpp_prefixdir=${prefix} echo $ac_n "checking for interface version number""... $ac_c" 1>&6 -echo "configure:19078: checking for interface version number" >&5 +echo "configure:19091: checking for interface version number" >&5 libstdcxx_interface=$INTERFACE echo "$ac_t""$libstdcxx_interface" 1>&6 # Process the option --with-gxx-include-dir= echo $ac_n "checking for --with-gxx-include-dir""... $ac_c" 1>&6 -echo "configure:19084: checking for --with-gxx-include-dir" >&5 +echo "configure:19097: checking for --with-gxx-include-dir" >&5 # Check whether --with-gxx-include-dir or --without-gxx-include-dir was given. if test "${with_gxx_include_dir+set}" = set; then withval="$with_gxx_include_dir" @@ -19104,7 +19117,7 @@ echo "$ac_t""$gxx_include_dir" 1>&6 # Process the option "--enable-version-specific-runtime-libs" echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6 -echo "configure:19108: checking for --enable-version-specific-runtime-libs" >&5 +echo "configure:19121: checking for --enable-version-specific-runtime-libs" >&5 # Check whether --enable-version-specific-runtime-libs or --disable-version-specific-runtime-libs was given. if test "${enable_version_specific_runtime_libs+set}" = set; then enableval="$enable_version_specific_runtime_libs" @@ -19151,7 +19164,7 @@ if test x"$glibcpp_toolexecdir" = x"no"; then fi echo $ac_n "checking for install location""... $ac_c" 1>&6 -echo "configure:19155: checking for install location" >&5 +echo "configure:19168: checking for install location" >&5 echo "$ac_t""$gxx_include_dir" 1>&6 diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 17c4baae0ec..eff88d03c7e 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -64,35 +64,6 @@ bits_headers = \ ${bits_srcdir}/slice.h \ ${bits_srcdir}/slice_array.h \ ${bits_srcdir}/sstream.tcc \ - ${bits_srcdir}/std_algorithm.h \ - ${bits_srcdir}/std_bitset.h \ - ${bits_srcdir}/std_complex.h \ - ${bits_srcdir}/std_deque.h \ - ${bits_srcdir}/std_fstream.h \ - ${bits_srcdir}/std_functional.h \ - ${bits_srcdir}/std_iomanip.h \ - ${bits_srcdir}/std_ios.h \ - ${bits_srcdir}/std_iosfwd.h \ - ${bits_srcdir}/std_iostream.h \ - ${bits_srcdir}/std_istream.h \ - ${bits_srcdir}/std_iterator.h \ - ${bits_srcdir}/std_limits.h \ - ${bits_srcdir}/std_list.h \ - ${bits_srcdir}/std_locale.h \ - ${bits_srcdir}/std_map.h \ - ${bits_srcdir}/std_memory.h \ - ${bits_srcdir}/std_numeric.h \ - ${bits_srcdir}/std_ostream.h \ - ${bits_srcdir}/std_queue.h \ - ${bits_srcdir}/std_set.h \ - ${bits_srcdir}/std_sstream.h \ - ${bits_srcdir}/std_stack.h \ - ${bits_srcdir}/std_stdexcept.h \ - ${bits_srcdir}/std_streambuf.h \ - ${bits_srcdir}/std_string.h \ - ${bits_srcdir}/std_utility.h \ - ${bits_srcdir}/std_valarray.h \ - ${bits_srcdir}/std_vector.h \ ${bits_srcdir}/stl_algo.h \ ${bits_srcdir}/stl_algobase.h \ ${bits_srcdir}/stl_alloc.h \ @@ -188,26 +159,27 @@ ext_headers = \ ${ext_srcdir}/stl_rope.h # This is the common subset of files that all three "C" header models use. -c_base_srcdir = @C_INCLUDE_DIR@/bits -c_base_builddir = ./bits +c_base_srcdir = @C_INCLUDE_DIR@/ +c_base_builddir = ./ c_base_headers = \ - ${c_base_srcdir}/std_cassert.h \ - ${c_base_srcdir}/std_cctype.h \ - ${c_base_srcdir}/std_cerrno.h \ - ${c_base_srcdir}/std_cfloat.h \ - ${c_base_srcdir}/std_climits.h \ - ${c_base_srcdir}/std_clocale.h \ - ${c_base_srcdir}/std_cmath.h \ - ${c_base_srcdir}/std_csetjmp.h \ - ${c_base_srcdir}/std_csignal.h \ - ${c_base_srcdir}/std_cstdarg.h \ - ${c_base_srcdir}/std_cstddef.h \ - ${c_base_srcdir}/std_cstdio.h \ - ${c_base_srcdir}/std_cstdlib.h \ - ${c_base_srcdir}/std_cstring.h \ - ${c_base_srcdir}/std_ctime.h \ - ${c_base_srcdir}/std_cwchar.h \ - ${c_base_srcdir}/std_cwctype.h \ + ${c_base_srcdir}/cassert \ + ${c_base_srcdir}/cctype \ + ${c_base_srcdir}/cerrno \ + ${c_base_srcdir}/cfloat \ + ${c_base_srcdir}/ciso646 \ + ${c_base_srcdir}/climits \ + ${c_base_srcdir}/clocale \ + ${c_base_srcdir}/cmath \ + ${c_base_srcdir}/csetjmp \ + ${c_base_srcdir}/csignal \ + ${c_base_srcdir}/cstdarg \ + ${c_base_srcdir}/cstddef \ + ${c_base_srcdir}/cstdio \ + ${c_base_srcdir}/cstdlib \ + ${c_base_srcdir}/cstring \ + ${c_base_srcdir}/ctime \ + ${c_base_srcdir}/cwchar \ + ${c_base_srcdir}/cwctype \ ${c_base_srcdir}/cmath.tcc std_srcdir = ${glibcpp_srcdir}/include/std @@ -241,25 +213,7 @@ std_headers = \ ${std_srcdir}/string \ ${std_srcdir}/utility \ ${std_srcdir}/valarray \ - ${std_srcdir}/vector \ - ${std_srcdir}/cassert \ - ${std_srcdir}/cctype \ - ${std_srcdir}/cerrno \ - ${std_srcdir}/cfloat \ - ${std_srcdir}/climits \ - ${std_srcdir}/clocale \ - ${std_srcdir}/ciso646 \ - ${std_srcdir}/cmath \ - ${std_srcdir}/csetjmp \ - ${std_srcdir}/csignal \ - ${std_srcdir}/cstdarg \ - ${std_srcdir}/cstddef \ - ${std_srcdir}/cstdio \ - ${std_srcdir}/cstdlib \ - ${std_srcdir}/cstring \ - ${std_srcdir}/ctime \ - ${std_srcdir}/cwchar \ - ${std_srcdir}/cwctype + ${std_srcdir}/vector target_srcdir = ${glibcpp_srcdir}/@OS_INC_SRCDIR@ target_builddir = ./${target_alias}/bits diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index f07088c2798..ab7981cc414 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -1,7 +1,6 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +10,6 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -@SET_MAKE@ SHELL = @SHELL@ @@ -33,9 +31,13 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include + +DESTDIR = + pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. ACLOCAL = @ACLOCAL@ @@ -44,11 +46,11 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ + NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -82,6 +84,7 @@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ DATADIRNAME = @DATADIRNAME@ DEBUG_FLAGS = @DEBUG_FLAGS@ DLLTOOL = @DLLTOOL@ +EXEEXT = @EXEEXT@ EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ @@ -105,6 +108,7 @@ LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ OBJDUMP = @OBJDUMP@ @@ -142,23 +146,16 @@ libtool_VERSION = @libtool_VERSION@ release_VERSION = @release_VERSION@ toplevel_srcdir = @toplevel_srcdir@ -# Cross compiler and multilib support. -CXX = @glibcpp_CXX@ -glibcpp_builddir = @glibcpp_builddir@ -glibcpp_srcdir = @glibcpp_srcdir@ - -# Target includes for threads -glibcpp_thread_h = @glibcpp_thread_h@ - -# One big happy istallation: just copy everything from the build to the -# install tree (except for the build stamps). -gxx_include_dir = @gxx_include_dir@ - AUTOMAKE_OPTIONS = 1.3 gnits MAINT_CHARSET = latin1 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs +# Cross compiler and multilib support. +CXX = @glibcpp_CXX@ +glibcpp_srcdir = @glibcpp_srcdir@ +glibcpp_builddir = @glibcpp_builddir@ + bits_srcdir = ${glibcpp_srcdir}/include/bits bits_builddir = ./bits bits_headers = \ @@ -192,35 +189,6 @@ bits_headers = \ ${bits_srcdir}/slice.h \ ${bits_srcdir}/slice_array.h \ ${bits_srcdir}/sstream.tcc \ - ${bits_srcdir}/std_algorithm.h \ - ${bits_srcdir}/std_bitset.h \ - ${bits_srcdir}/std_complex.h \ - ${bits_srcdir}/std_deque.h \ - ${bits_srcdir}/std_fstream.h \ - ${bits_srcdir}/std_functional.h \ - ${bits_srcdir}/std_iomanip.h \ - ${bits_srcdir}/std_ios.h \ - ${bits_srcdir}/std_iosfwd.h \ - ${bits_srcdir}/std_iostream.h \ - ${bits_srcdir}/std_istream.h \ - ${bits_srcdir}/std_iterator.h \ - ${bits_srcdir}/std_limits.h \ - ${bits_srcdir}/std_list.h \ - ${bits_srcdir}/std_locale.h \ - ${bits_srcdir}/std_map.h \ - ${bits_srcdir}/std_memory.h \ - ${bits_srcdir}/std_numeric.h \ - ${bits_srcdir}/std_ostream.h \ - ${bits_srcdir}/std_queue.h \ - ${bits_srcdir}/std_set.h \ - ${bits_srcdir}/std_sstream.h \ - ${bits_srcdir}/std_stack.h \ - ${bits_srcdir}/std_stdexcept.h \ - ${bits_srcdir}/std_streambuf.h \ - ${bits_srcdir}/std_string.h \ - ${bits_srcdir}/std_utility.h \ - ${bits_srcdir}/std_valarray.h \ - ${bits_srcdir}/std_vector.h \ ${bits_srcdir}/stl_algo.h \ ${bits_srcdir}/stl_algobase.h \ ${bits_srcdir}/stl_alloc.h \ @@ -319,26 +287,27 @@ ext_headers = \ # This is the common subset of files that all three "C" header models use. -c_base_srcdir = @C_INCLUDE_DIR@/bits -c_base_builddir = ./bits +c_base_srcdir = @C_INCLUDE_DIR@/ +c_base_builddir = ./ c_base_headers = \ - ${c_base_srcdir}/std_cassert.h \ - ${c_base_srcdir}/std_cctype.h \ - ${c_base_srcdir}/std_cerrno.h \ - ${c_base_srcdir}/std_cfloat.h \ - ${c_base_srcdir}/std_climits.h \ - ${c_base_srcdir}/std_clocale.h \ - ${c_base_srcdir}/std_cmath.h \ - ${c_base_srcdir}/std_csetjmp.h \ - ${c_base_srcdir}/std_csignal.h \ - ${c_base_srcdir}/std_cstdarg.h \ - ${c_base_srcdir}/std_cstddef.h \ - ${c_base_srcdir}/std_cstdio.h \ - ${c_base_srcdir}/std_cstdlib.h \ - ${c_base_srcdir}/std_cstring.h \ - ${c_base_srcdir}/std_ctime.h \ - ${c_base_srcdir}/std_cwchar.h \ - ${c_base_srcdir}/std_cwctype.h \ + ${c_base_srcdir}/cassert \ + ${c_base_srcdir}/cctype \ + ${c_base_srcdir}/cerrno \ + ${c_base_srcdir}/cfloat \ + ${c_base_srcdir}/ciso646 \ + ${c_base_srcdir}/climits \ + ${c_base_srcdir}/clocale \ + ${c_base_srcdir}/cmath \ + ${c_base_srcdir}/csetjmp \ + ${c_base_srcdir}/csignal \ + ${c_base_srcdir}/cstdarg \ + ${c_base_srcdir}/cstddef \ + ${c_base_srcdir}/cstdio \ + ${c_base_srcdir}/cstdlib \ + ${c_base_srcdir}/cstring \ + ${c_base_srcdir}/ctime \ + ${c_base_srcdir}/cwchar \ + ${c_base_srcdir}/cwctype \ ${c_base_srcdir}/cmath.tcc @@ -373,25 +342,7 @@ std_headers = \ ${std_srcdir}/string \ ${std_srcdir}/utility \ ${std_srcdir}/valarray \ - ${std_srcdir}/vector \ - ${std_srcdir}/cassert \ - ${std_srcdir}/cctype \ - ${std_srcdir}/cerrno \ - ${std_srcdir}/cfloat \ - ${std_srcdir}/climits \ - ${std_srcdir}/clocale \ - ${std_srcdir}/ciso646 \ - ${std_srcdir}/cmath \ - ${std_srcdir}/csetjmp \ - ${std_srcdir}/csignal \ - ${std_srcdir}/cstdarg \ - ${std_srcdir}/cstddef \ - ${std_srcdir}/cstdio \ - ${std_srcdir}/cstdlib \ - ${std_srcdir}/cstring \ - ${std_srcdir}/ctime \ - ${std_srcdir}/cwchar \ - ${std_srcdir}/cwctype + ${std_srcdir}/vector target_srcdir = ${glibcpp_srcdir}/@OS_INC_SRCDIR@ @@ -417,108 +368,114 @@ thread_headers = \ allstamps = stamp-std stamp-bits stamp-c_base stamp-backward stamp-ext \ stamp-target stamp-thread + +# Target includes for threads +glibcpp_thread_h = @glibcpp_thread_h@ uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_] -subdir = include -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -depcomp = -DIST_SOURCES = -all: all-am -.SUFFIXES: +# One big happy istallation: just copy everything from the build to the +# install tree (except for the build stamps). +gxx_include_dir = @gxx_include_dir@ +CONFIG_HEADER = ../config.h +CONFIG_CLEAN_FILES = +DIST_COMMON = Makefile.am Makefile.in -mostlyclean-libtool: - -rm -f *.lo -clean-libtool: - -rm -rf .libs _libs +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = gtar +GZIP_ENV = --best +all: all-redirect +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --cygnus include/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -distclean-libtool: - -rm -f libtool -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --cygnus include/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status -uninstall-info-am: tags: TAGS TAGS: -check-am: -check: check-am -all-am: Makefile all-local -installdirs: +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) -install: install-am +subdir = include + +distdir: $(DISTFILES) + @for file in $(DISTFILES); do \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + cp -pr $$d/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: +check: check-am +installcheck-am: +installcheck: installcheck-am +install-info-am: +install-info: install-info-am +install-exec-am: install-exec: install-exec-am + +install-data-am: install-data-local install-data: install-data-am -uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am +install: install-am +uninstall-am: +uninstall: uninstall-am +all-am: Makefile all-local +all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + + mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -distclean-am: clean-am distclean-generic distclean-libtool +mostlyclean-am: mostlyclean-generic -dvi: dvi-am - -dvi-am: - -info: info-am - -info-am: +mostlyclean: mostlyclean-am -install-data-am: install-data-local +clean-am: clean-generic mostlyclean-am -install-exec-am: +clean: clean-am -install-info: +distclean-am: distclean-generic clean-am + -rm -f libtool -install-man: +distclean: distclean-am -installcheck-am: +maintainer-clean-am: maintainer-clean-generic distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -uninstall-am: - -.PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool distclean distclean-generic distclean-libtool dvi \ - dvi-am info info-am install install-am install-data \ - install-data-am install-data-local install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool uninstall uninstall-am uninstall-info-am +.PHONY: tags distdir info-am info dvi-am dvi check check-am \ +installcheck-am installcheck install-info-am install-info \ +install-exec-am install-exec install-data-local install-data-am \ +install-data install-am install uninstall-am uninstall all-local \ +all-redirect all-am all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean # Here are the rules for building the headers @@ -625,6 +582,7 @@ install-data-local: # By adding these files here, automake will remove them for 'make clean' #CLEANFILES = ${allstamps} + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/libstdc++-v3/include/backward/bvector.h b/libstdc++-v3/include/backward/bvector.h index 4a04ca691d7..b114052933a 100644 --- a/libstdc++-v3/include/backward/bvector.h +++ b/libstdc++-v3/include/backward/bvector.h @@ -58,7 +58,7 @@ #include "backward_warning.h" -#include +#include using std::bit_vector; @@ -67,5 +67,3 @@ using std::bit_vector; // Local Variables: // mode:C++ // End: - - diff --git a/libstdc++-v3/include/backward/complex.h b/libstdc++-v3/include/backward/complex.h index c7e1d1c1bec..0e721744a6b 100644 --- a/libstdc++-v3/include/backward/complex.h +++ b/libstdc++-v3/include/backward/complex.h @@ -29,7 +29,7 @@ #define _CPP_BACKWARD_COMPLEX_H 1 #include "backward_warning.h" -#include +#include using std::complex; typedef complex float_complex; diff --git a/libstdc++-v3/include/backward/deque.h b/libstdc++-v3/include/backward/deque.h index de4bf6a9a33..983ae07bac7 100644 --- a/libstdc++-v3/include/backward/deque.h +++ b/libstdc++-v3/include/backward/deque.h @@ -59,7 +59,7 @@ #include "backward_warning.h" #include "algobase.h" #include "alloc.h" -#include +#include using std::deque; diff --git a/libstdc++-v3/include/backward/fstream.h b/libstdc++-v3/include/backward/fstream.h index 4f03e4c6c84..44461f464dd 100644 --- a/libstdc++-v3/include/backward/fstream.h +++ b/libstdc++-v3/include/backward/fstream.h @@ -29,7 +29,7 @@ #define _CPP_BACKWARD_FSTREAM_H 1 #include "backward_warning.h" -#include +#include using std::filebuf; using std::ifstream; diff --git a/libstdc++-v3/include/backward/iomanip.h b/libstdc++-v3/include/backward/iomanip.h index dad183edde1..53286cda494 100644 --- a/libstdc++-v3/include/backward/iomanip.h +++ b/libstdc++-v3/include/backward/iomanip.h @@ -30,7 +30,7 @@ #include "backward_warning.h" #include "iostream.h" -#include +#include // These are from as per [27.4]. using std::boolalpha; diff --git a/libstdc++-v3/include/backward/iostream.h b/libstdc++-v3/include/backward/iostream.h index 0d258af1434..5346d9d22e8 100644 --- a/libstdc++-v3/include/backward/iostream.h +++ b/libstdc++-v3/include/backward/iostream.h @@ -29,7 +29,7 @@ #define _CPP_BACKWARD_IOSTREAM_H 1 #include "backward_warning.h" -#include +#include using std::iostream; using std::ostream; diff --git a/libstdc++-v3/include/backward/iterator.h b/libstdc++-v3/include/backward/iterator.h index 8624fc28a7f..179f457d324 100644 --- a/libstdc++-v3/include/backward/iterator.h +++ b/libstdc++-v3/include/backward/iterator.h @@ -31,7 +31,7 @@ #include "function.h" #include #include "iostream.h" -#include +#include #include #include diff --git a/libstdc++-v3/include/backward/list.h b/libstdc++-v3/include/backward/list.h index e9db48cb9b8..350a92a0991 100644 --- a/libstdc++-v3/include/backward/list.h +++ b/libstdc++-v3/include/backward/list.h @@ -59,7 +59,7 @@ #include "backward_warning.h" #include "algobase.h" #include "alloc.h" -#include +#include using std::list; diff --git a/libstdc++-v3/include/backward/map.h b/libstdc++-v3/include/backward/map.h index fb7911a370a..00f606d7e32 100644 --- a/libstdc++-v3/include/backward/map.h +++ b/libstdc++-v3/include/backward/map.h @@ -58,7 +58,7 @@ #include "backward_warning.h" #include "tree.h" -#include +#include using std::map; diff --git a/libstdc++-v3/include/backward/multimap.h b/libstdc++-v3/include/backward/multimap.h index 2b36dd3121a..b9cdc848360 100644 --- a/libstdc++-v3/include/backward/multimap.h +++ b/libstdc++-v3/include/backward/multimap.h @@ -58,7 +58,7 @@ #include "backward_warning.h" #include "tree.h" -#include +#include using std::multimap; diff --git a/libstdc++-v3/include/backward/multiset.h b/libstdc++-v3/include/backward/multiset.h index fb2c02c9ea2..8aa7fd34157 100644 --- a/libstdc++-v3/include/backward/multiset.h +++ b/libstdc++-v3/include/backward/multiset.h @@ -58,7 +58,7 @@ #include "backward_warning.h" #include "tree.h" -#include +#include using std::multiset; diff --git a/libstdc++-v3/include/backward/queue.h b/libstdc++-v3/include/backward/queue.h index 6eaf246a18b..1d3b29c36b5 100644 --- a/libstdc++-v3/include/backward/queue.h +++ b/libstdc++-v3/include/backward/queue.h @@ -29,7 +29,7 @@ #define _CPP_BACKWARD_QUEUE_H 1 #include "backward_warning.h" -#include +#include using std::queue; using std::priority_queue; diff --git a/libstdc++-v3/include/backward/set.h b/libstdc++-v3/include/backward/set.h index ae4011a1dae..c1892554495 100644 --- a/libstdc++-v3/include/backward/set.h +++ b/libstdc++-v3/include/backward/set.h @@ -58,7 +58,7 @@ #include "backward_warning.h" #include "tree.h" -#include +#include using std::set; diff --git a/libstdc++-v3/include/backward/stack.h b/libstdc++-v3/include/backward/stack.h index 19e8cd17534..6f602936630 100644 --- a/libstdc++-v3/include/backward/stack.h +++ b/libstdc++-v3/include/backward/stack.h @@ -61,7 +61,7 @@ #include "deque.h" #include "heap.h" #include "queue.h" -#include +#include using std::stack; diff --git a/libstdc++-v3/include/backward/streambuf.h b/libstdc++-v3/include/backward/streambuf.h index 3965816dc45..aef863ff133 100644 --- a/libstdc++-v3/include/backward/streambuf.h +++ b/libstdc++-v3/include/backward/streambuf.h @@ -29,7 +29,7 @@ #define _CPP_BACKWARD_STREAMBUF_H 1 #include "backward_warning.h" -#include +#include using std::streambuf; diff --git a/libstdc++-v3/include/backward/strstream b/libstdc++-v3/include/backward/strstream index f60010c4712..28308e3dfee 100644 --- a/libstdc++-v3/include/backward/strstream +++ b/libstdc++-v3/include/backward/strstream @@ -49,11 +49,11 @@ #define __SGI_STL_STRSTREAM #include "backward_warning.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace std { diff --git a/libstdc++-v3/include/backward/vector.h b/libstdc++-v3/include/backward/vector.h index 1746cb25f27..77880686f0d 100644 --- a/libstdc++-v3/include/backward/vector.h +++ b/libstdc++-v3/include/backward/vector.h @@ -59,7 +59,7 @@ #include "backward_warning.h" #include "algobase.h" #include "alloc.h" -#include +#include using std::vector; diff --git a/libstdc++-v3/include/bits/basic_file.h b/libstdc++-v3/include/bits/basic_file.h index 9c0c1d36441..51dde5bc4c3 100644 --- a/libstdc++-v3/include/bits/basic_file.h +++ b/libstdc++-v3/include/bits/basic_file.h @@ -42,7 +42,7 @@ #pragma GCC system_header #include -#include +#include namespace std { diff --git a/libstdc++-v3/include/bits/boost_concept_check.h b/libstdc++-v3/include/bits/boost_concept_check.h index bea39cfd8bc..29ca61baef7 100644 --- a/libstdc++-v3/include/bits/boost_concept_check.h +++ b/libstdc++-v3/include/bits/boost_concept_check.h @@ -17,7 +17,7 @@ #define _GLIBCPP_BOOST_CONCEPT_CHECK 1 #pragma GCC system_header -#include // for ptrdiff_t, used next +#include // for ptrdiff_t, used next #include // for traits and tags #include // for pair<> diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h index 710e0eb6a53..7d14838ab26 100644 --- a/libstdc++-v3/include/bits/char_traits.h +++ b/libstdc++-v3/include/bits/char_traits.h @@ -41,7 +41,7 @@ #pragma GCC system_header -#include // For memmove, memset, memchr +#include // For memmove, memset, memchr #include // For streampos namespace std diff --git a/libstdc++-v3/include/bits/fpos.h b/libstdc++-v3/include/bits/fpos.h index 119fbe7f528..3cb3e4b51a2 100644 --- a/libstdc++-v3/include/bits/fpos.h +++ b/libstdc++-v3/include/bits/fpos.h @@ -42,7 +42,7 @@ #pragma GCC system_header #include -#include // For mbstate_t. +#include // For mbstate_t. namespace std { @@ -121,6 +121,3 @@ namespace std } // namespace std #endif - - - diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc index 43ea6a5a37e..4bc8da1c899 100644 --- a/libstdc++-v3/include/bits/istream.tcc +++ b/libstdc++-v3/include/bits/istream.tcc @@ -29,8 +29,8 @@ // ISO C++ 14882: 27.6.2 Output streams // -#include -#include // for flush() +#include +#include // For flush() namespace std { diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h index 8550709b057..824b03a18ca 100644 --- a/libstdc++-v3/include/bits/locale_facets.h +++ b/libstdc++-v3/include/bits/locale_facets.h @@ -41,11 +41,11 @@ #pragma GCC system_header -#include // For struct tm -#include // For ios_base +#include // For struct tm #ifdef _GLIBCPP_USE_WCHAR_T -# include // For wctype_t +# include // For wctype_t #endif +#include // For ios_base namespace std { diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index 58d72c7fd0c..2731640029f 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -32,16 +32,16 @@ #ifndef _CPP_BITS_LOCFACETS_TCC #define _CPP_BITS_LOCFACETS_TCC 1 -#include -#include // For localeconv -#include // For strof, strtold -#include // For ceil -#include // For numeric_limits -#include // For auto_ptr +#include +#include // For localeconv +#include // For strof, strtold +#include // For ceil +#include // For isspace +#include // For numeric_limits +#include // For auto_ptr #include // For streambuf_iterators -#include // For isspace #include // For bad_cast -#include +#include namespace std { diff --git a/libstdc++-v3/include/bits/localefwd.h b/libstdc++-v3/include/bits/localefwd.h index a0fe3248587..558ccabe2de 100644 --- a/libstdc++-v3/include/bits/localefwd.h +++ b/libstdc++-v3/include/bits/localefwd.h @@ -43,9 +43,9 @@ #include #include // Defines __c_locale, config-specific includes -#include // For CHAR_BIT -#include // For string -#include // For isspace, etc. +#include // For CHAR_BIT +#include // For isspace, etc. +#include // For string #include namespace std diff --git a/libstdc++-v3/include/bits/ostream.tcc b/libstdc++-v3/include/bits/ostream.tcc index ff3c958c05e..698029ce5c1 100644 --- a/libstdc++-v3/include/bits/ostream.tcc +++ b/libstdc++-v3/include/bits/ostream.tcc @@ -29,7 +29,7 @@ // ISO C++ 14882: 27.6.2 Output streams // -#include +#include namespace std { diff --git a/libstdc++-v3/include/bits/pthread_allocimpl.h b/libstdc++-v3/include/bits/pthread_allocimpl.h index ca0f980fbf4..050b2060fc4 100644 --- a/libstdc++-v3/include/bits/pthread_allocimpl.h +++ b/libstdc++-v3/include/bits/pthread_allocimpl.h @@ -62,7 +62,7 @@ // consequences. #include -#include +#include #include #ifndef __RESTRICT # define __RESTRICT diff --git a/libstdc++-v3/include/bits/sstream.tcc b/libstdc++-v3/include/bits/sstream.tcc index 2a03ff0de58..4198ea80fa4 100644 --- a/libstdc++-v3/include/bits/sstream.tcc +++ b/libstdc++-v3/include/bits/sstream.tcc @@ -34,7 +34,7 @@ #ifndef _CPP_BITS_SSTREAM_TCC #define _CPP_BITS_SSTREAM_TCC 1 -#include +#include namespace std { diff --git a/libstdc++-v3/include/bits/std_ios.h b/libstdc++-v3/include/bits/std_ios.h deleted file mode 100644 index dfd041f811f..00000000000 --- a/libstdc++-v3/include/bits/std_ios.h +++ /dev/null @@ -1,54 +0,0 @@ -// Iostreams base classes -*- C++ -*- - -// Copyright (C) 1997, 1998, 1999, 2001 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 -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -// -// ISO C++ 14882: 27.4 Iostreams base classes -// - -/** @file std_ios.h - * This is an internal header file, included by other library headers. - * You should not attempt to use it directly. - */ - -#ifndef _CPP_IOS -#define _CPP_IOS 1 - -#pragma GCC system_header - -#include -#include // For ios_base::failure -#include // For char_traits, streamoff, streamsize, fpos -#include // For SEEK_SET, SEEK_CUR, SEEK_END -#include // For class locale -#include // For ios_base declarations. -#include -#include - -#endif /* _CPP_IOS */ - diff --git a/libstdc++-v3/include/bits/std_locale.h b/libstdc++-v3/include/bits/std_locale.h deleted file mode 100644 index 82089d01539..00000000000 --- a/libstdc++-v3/include/bits/std_locale.h +++ /dev/null @@ -1,52 +0,0 @@ -// Locale support -*- C++ -*- - -// Copyright (C) 1997-1999 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 -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -// -// ISO C++ 14882: 22.1 Locales -// - -/** @file std_locale.h - * This is an internal header file, included by other library headers. - * You should not attempt to use it directly. - */ - -#ifndef _CPP_LOCALE -#define _CPP_LOCALE 1 - -#pragma GCC system_header - -#include -#include -#include - -#endif - -// Local Variables: -// mode:c++ -// End: diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index 2453976d628..6e488eae355 100644 --- a/libstdc++-v3/include/bits/stl_algobase.h +++ b/libstdc++-v3/include/bits/stl_algobase.h @@ -1,6 +1,6 @@ // Bits and pieces used in algorithms -*- C++ -*- -// Copyright (C) 2001 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002 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 @@ -62,15 +62,14 @@ #define __GLIBCPP_INTERNAL_ALGOBASE_H #include +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include - -#include #include #include #include @@ -78,7 +77,6 @@ namespace std { - // swap and iter_swap /** diff --git a/libstdc++-v3/include/bits/stl_alloc.h b/libstdc++-v3/include/bits/stl_alloc.h index 751dffece77..66d2ef66529 100644 --- a/libstdc++-v3/include/bits/stl_alloc.h +++ b/libstdc++-v3/include/bits/stl_alloc.h @@ -78,12 +78,11 @@ * or online at http://gcc.gnu.org/onlinedocs/libstdc++/ext/howto.html#3 */ - -#include // for __throw_bad_alloc -#include -#include -#include -#include +#include +#include +#include +#include +#include // For __throw_bad_alloc #include namespace std diff --git a/libstdc++-v3/include/bits/stl_uninitialized.h b/libstdc++-v3/include/bits/stl_uninitialized.h index f679d52b1d7..866b20bf37e 100644 --- a/libstdc++-v3/include/bits/stl_uninitialized.h +++ b/libstdc++-v3/include/bits/stl_uninitialized.h @@ -61,7 +61,7 @@ #ifndef _CPP_BITS_STL_UNINITIALIZED_H #define _CPP_BITS_STL_UNINITIALIZED_H 1 -#include +#include namespace std { diff --git a/libstdc++-v3/include/bits/valarray_array.h b/libstdc++-v3/include/bits/valarray_array.h index 1ef10e60b01..5b425e4be6e 100644 --- a/libstdc++-v3/include/bits/valarray_array.h +++ b/libstdc++-v3/include/bits/valarray_array.h @@ -41,8 +41,8 @@ #include #include -#include -#include +#include +#include #include namespace std diff --git a/libstdc++-v3/include/c/bits/std_cassert.h b/libstdc++-v3/include/c/cassert similarity index 100% rename from libstdc++-v3/include/c/bits/std_cassert.h rename to libstdc++-v3/include/c/cassert diff --git a/libstdc++-v3/include/c/bits/std_cctype.h b/libstdc++-v3/include/c/cctype similarity index 100% rename from libstdc++-v3/include/c/bits/std_cctype.h rename to libstdc++-v3/include/c/cctype diff --git a/libstdc++-v3/include/c/bits/std_cerrno.h b/libstdc++-v3/include/c/cerrno similarity index 100% rename from libstdc++-v3/include/c/bits/std_cerrno.h rename to libstdc++-v3/include/c/cerrno diff --git a/libstdc++-v3/include/c/bits/std_cfloat.h b/libstdc++-v3/include/c/cfloat similarity index 100% rename from libstdc++-v3/include/c/bits/std_cfloat.h rename to libstdc++-v3/include/c/cfloat diff --git a/libstdc++-v3/include/std/ciso646 b/libstdc++-v3/include/c/ciso646 similarity index 100% copy from libstdc++-v3/include/std/ciso646 copy to libstdc++-v3/include/c/ciso646 diff --git a/libstdc++-v3/include/c/bits/std_climits.h b/libstdc++-v3/include/c/climits similarity index 100% rename from libstdc++-v3/include/c/bits/std_climits.h rename to libstdc++-v3/include/c/climits diff --git a/libstdc++-v3/include/c/bits/std_clocale.h b/libstdc++-v3/include/c/clocale similarity index 100% rename from libstdc++-v3/include/c/bits/std_clocale.h rename to libstdc++-v3/include/c/clocale diff --git a/libstdc++-v3/include/c/bits/std_cmath.h b/libstdc++-v3/include/c/cmath similarity index 100% rename from libstdc++-v3/include/c/bits/std_cmath.h rename to libstdc++-v3/include/c/cmath diff --git a/libstdc++-v3/include/c/bits/std_csetjmp.h b/libstdc++-v3/include/c/csetjmp similarity index 100% rename from libstdc++-v3/include/c/bits/std_csetjmp.h rename to libstdc++-v3/include/c/csetjmp diff --git a/libstdc++-v3/include/c/bits/std_csignal.h b/libstdc++-v3/include/c/csignal similarity index 100% rename from libstdc++-v3/include/c/bits/std_csignal.h rename to libstdc++-v3/include/c/csignal diff --git a/libstdc++-v3/include/c/bits/std_cstdarg.h b/libstdc++-v3/include/c/cstdarg similarity index 100% rename from libstdc++-v3/include/c/bits/std_cstdarg.h rename to libstdc++-v3/include/c/cstdarg diff --git a/libstdc++-v3/include/c/bits/std_cstddef.h b/libstdc++-v3/include/c/cstddef similarity index 100% rename from libstdc++-v3/include/c/bits/std_cstddef.h rename to libstdc++-v3/include/c/cstddef diff --git a/libstdc++-v3/include/c/bits/std_cstdio.h b/libstdc++-v3/include/c/cstdio similarity index 100% rename from libstdc++-v3/include/c/bits/std_cstdio.h rename to libstdc++-v3/include/c/cstdio diff --git a/libstdc++-v3/include/c/bits/std_cstdlib.h b/libstdc++-v3/include/c/cstdlib similarity index 100% rename from libstdc++-v3/include/c/bits/std_cstdlib.h rename to libstdc++-v3/include/c/cstdlib diff --git a/libstdc++-v3/include/c/bits/std_cstring.h b/libstdc++-v3/include/c/cstring similarity index 100% rename from libstdc++-v3/include/c/bits/std_cstring.h rename to libstdc++-v3/include/c/cstring diff --git a/libstdc++-v3/include/c/bits/std_ctime.h b/libstdc++-v3/include/c/ctime similarity index 100% rename from libstdc++-v3/include/c/bits/std_ctime.h rename to libstdc++-v3/include/c/ctime diff --git a/libstdc++-v3/include/c/bits/std_cwchar.h b/libstdc++-v3/include/c/cwchar similarity index 100% rename from libstdc++-v3/include/c/bits/std_cwchar.h rename to libstdc++-v3/include/c/cwchar diff --git a/libstdc++-v3/include/c/bits/std_cwctype.h b/libstdc++-v3/include/c/cwctype similarity index 100% rename from libstdc++-v3/include/c/bits/std_cwctype.h rename to libstdc++-v3/include/c/cwctype diff --git a/libstdc++-v3/include/c_std/bits/std_cassert.h b/libstdc++-v3/include/c_std/cassert similarity index 100% rename from libstdc++-v3/include/c_std/bits/std_cassert.h rename to libstdc++-v3/include/c_std/cassert diff --git a/libstdc++-v3/include/c_std/bits/std_cctype.h b/libstdc++-v3/include/c_std/cctype similarity index 100% rename from libstdc++-v3/include/c_std/bits/std_cctype.h rename to libstdc++-v3/include/c_std/cctype diff --git a/libstdc++-v3/include/c_std/bits/std_cerrno.h b/libstdc++-v3/include/c_std/cerrno similarity index 100% rename from libstdc++-v3/include/c_std/bits/std_cerrno.h rename to libstdc++-v3/include/c_std/cerrno diff --git a/libstdc++-v3/include/c_std/bits/std_cfloat.h b/libstdc++-v3/include/c_std/cfloat similarity index 100% rename from libstdc++-v3/include/c_std/bits/std_cfloat.h rename to libstdc++-v3/include/c_std/cfloat diff --git a/libstdc++-v3/include/std/ciso646 b/libstdc++-v3/include/c_std/ciso646 similarity index 100% rename from libstdc++-v3/include/std/ciso646 rename to libstdc++-v3/include/c_std/ciso646 diff --git a/libstdc++-v3/include/c_std/bits/std_climits.h b/libstdc++-v3/include/c_std/climits similarity index 100% rename from libstdc++-v3/include/c_std/bits/std_climits.h rename to libstdc++-v3/include/c_std/climits diff --git a/libstdc++-v3/include/c_std/bits/std_clocale.h b/libstdc++-v3/include/c_std/clocale similarity index 100% rename from libstdc++-v3/include/c_std/bits/std_clocale.h rename to libstdc++-v3/include/c_std/clocale diff --git a/libstdc++-v3/include/c_std/bits/std_cmath.h b/libstdc++-v3/include/c_std/cmath similarity index 99% rename from libstdc++-v3/include/c_std/bits/std_cmath.h rename to libstdc++-v3/include/c_std/cmath index fedc5fb1a98..79644cec8fe 100644 --- a/libstdc++-v3/include/c_std/bits/std_cmath.h +++ b/libstdc++-v3/include/c_std/cmath @@ -647,7 +647,7 @@ namespace std #ifdef _GLIBCPP_NO_TEMPLATE_EXPORT # define export -# include +# include #endif #endif diff --git a/libstdc++-v3/include/c_std/bits/cmath.tcc b/libstdc++-v3/include/c_std/cmath.tcc similarity index 100% rename from libstdc++-v3/include/c_std/bits/cmath.tcc rename to libstdc++-v3/include/c_std/cmath.tcc diff --git a/libstdc++-v3/include/c_std/bits/std_csetjmp.h b/libstdc++-v3/include/c_std/csetjmp similarity index 100% rename from libstdc++-v3/include/c_std/bits/std_csetjmp.h rename to libstdc++-v3/include/c_std/csetjmp diff --git a/libstdc++-v3/include/c_std/bits/std_csignal.h b/libstdc++-v3/include/c_std/csignal similarity index 100% rename from libstdc++-v3/include/c_std/bits/std_csignal.h rename to libstdc++-v3/include/c_std/csignal diff --git a/libstdc++-v3/include/c_std/bits/std_cstdarg.h b/libstdc++-v3/include/c_std/cstdarg similarity index 100% rename from libstdc++-v3/include/c_std/bits/std_cstdarg.h rename to libstdc++-v3/include/c_std/cstdarg diff --git a/libstdc++-v3/include/c_std/bits/std_cstddef.h b/libstdc++-v3/include/c_std/cstddef similarity index 100% rename from libstdc++-v3/include/c_std/bits/std_cstddef.h rename to libstdc++-v3/include/c_std/cstddef diff --git a/libstdc++-v3/include/c_std/bits/std_cstdio.h b/libstdc++-v3/include/c_std/cstdio similarity index 99% rename from libstdc++-v3/include/c_std/bits/std_cstdio.h rename to libstdc++-v3/include/c_std/cstdio index a4c67d22acd..a6c78d221d5 100644 --- a/libstdc++-v3/include/c_std/bits/std_cstdio.h +++ b/libstdc++-v3/include/c_std/cstdio @@ -35,7 +35,7 @@ #define _CPP_CSTDIO 1 #include -#include +#include #pragma GCC system_header #include diff --git a/libstdc++-v3/include/c_std/bits/std_cstdlib.h b/libstdc++-v3/include/c_std/cstdlib similarity index 99% rename from libstdc++-v3/include/c_std/bits/std_cstdlib.h rename to libstdc++-v3/include/c_std/cstdlib index b67ce44f937..73176dbedbb 100644 --- a/libstdc++-v3/include/c_std/bits/std_cstdlib.h +++ b/libstdc++-v3/include/c_std/cstdlib @@ -35,7 +35,7 @@ #define _CPP_CSTDLIB 1 #include -#include +#include #pragma GCC system_header #include diff --git a/libstdc++-v3/include/c_std/bits/std_cstring.h b/libstdc++-v3/include/c_std/cstring similarity index 99% rename from libstdc++-v3/include/c_std/bits/std_cstring.h rename to libstdc++-v3/include/c_std/cstring index ab6a6a66c4d..9708c898990 100644 --- a/libstdc++-v3/include/c_std/bits/std_cstring.h +++ b/libstdc++-v3/include/c_std/cstring @@ -34,7 +34,7 @@ #ifndef _CPP_CSTRING #define _CPP_CSTRING 1 -#include +#include #pragma GCC system_header #include diff --git a/libstdc++-v3/include/c_std/bits/std_ctime.h b/libstdc++-v3/include/c_std/ctime similarity index 98% rename from libstdc++-v3/include/c_std/bits/std_ctime.h rename to libstdc++-v3/include/c_std/ctime index a9051b49735..c5c108b686f 100644 --- a/libstdc++-v3/include/c_std/bits/std_ctime.h +++ b/libstdc++-v3/include/c_std/ctime @@ -34,7 +34,7 @@ #ifndef _CPP_CTIME #define _CPP_CTIME 1 -#include +#include #pragma GCC system_header #include diff --git a/libstdc++-v3/include/c_std/bits/std_cwchar.h b/libstdc++-v3/include/c_std/cwchar similarity index 98% rename from libstdc++-v3/include/c_std/bits/std_cwchar.h rename to libstdc++-v3/include/c_std/cwchar index b19cfeaadc2..8e69d518509 100644 --- a/libstdc++-v3/include/c_std/bits/std_cwchar.h +++ b/libstdc++-v3/include/c_std/cwchar @@ -35,8 +35,8 @@ #define _CPP_CWCHAR 1 #include -#include -#include +#include +#include #if _GLIBCPP_HAVE_WCHAR_H #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/bits/std_cwctype.h b/libstdc++-v3/include/c_std/cwctype similarity index 100% rename from libstdc++-v3/include/c_std/bits/std_cwctype.h rename to libstdc++-v3/include/c_std/cwctype diff --git a/libstdc++-v3/include/ext/algorithm b/libstdc++-v3/include/ext/algorithm index 588c722138f..5b7fbff3a17 100644 --- a/libstdc++-v3/include/ext/algorithm +++ b/libstdc++-v3/include/ext/algorithm @@ -57,7 +57,7 @@ #define _EXT_ALGORITHM #pragma GCC system_header -#include +#include namespace __gnu_cxx { diff --git a/libstdc++-v3/include/ext/functional b/libstdc++-v3/include/ext/functional index 8a171615553..cee35583d36 100644 --- a/libstdc++-v3/include/ext/functional +++ b/libstdc++-v3/include/ext/functional @@ -57,7 +57,7 @@ #define _EXT_FUNCTIONAL #pragma GCC system_header -#include +#include namespace __gnu_cxx { diff --git a/libstdc++-v3/include/ext/iterator b/libstdc++-v3/include/ext/iterator index 73fd6c861a0..c7acdda44c9 100644 --- a/libstdc++-v3/include/ext/iterator +++ b/libstdc++-v3/include/ext/iterator @@ -63,7 +63,7 @@ #pragma GCC system_header #include -#include +#include namespace __gnu_cxx { diff --git a/libstdc++-v3/include/ext/memory b/libstdc++-v3/include/ext/memory index 84c31f05684..73fa42783c9 100644 --- a/libstdc++-v3/include/ext/memory +++ b/libstdc++-v3/include/ext/memory @@ -57,7 +57,7 @@ #define _EXT_MEMORY #pragma GCC system_header -#include +#include namespace __gnu_cxx { diff --git a/libstdc++-v3/include/ext/numeric b/libstdc++-v3/include/ext/numeric index 93364678d48..5b33a893b80 100644 --- a/libstdc++-v3/include/ext/numeric +++ b/libstdc++-v3/include/ext/numeric @@ -58,7 +58,7 @@ #pragma GCC system_header #include -#include +#include #include // For identity_element diff --git a/libstdc++-v3/include/ext/ropeimpl.h b/libstdc++-v3/include/ext/ropeimpl.h index b3e694cf15a..19618efc00c 100644 --- a/libstdc++-v3/include/ext/ropeimpl.h +++ b/libstdc++-v3/include/ext/ropeimpl.h @@ -45,8 +45,8 @@ * You should not attempt to use it directly. */ -#include -#include +#include +#include #include #include // For copy_n and lexicographical_compare_3way diff --git a/libstdc++-v3/include/ext/stl_hash_fun.h b/libstdc++-v3/include/ext/stl_hash_fun.h index 64ddab86eda..c251ed31b9a 100644 --- a/libstdc++-v3/include/ext/stl_hash_fun.h +++ b/libstdc++-v3/include/ext/stl_hash_fun.h @@ -61,7 +61,7 @@ #ifndef _CPP_BITS_STL_HASH_FUN_H #define _CPP_BITS_STL_HASH_FUN_H 1 -#include +#include namespace __gnu_cxx { diff --git a/libstdc++-v3/include/bits/std_algorithm.h b/libstdc++-v3/include/std/algorithm similarity index 100% rename from libstdc++-v3/include/bits/std_algorithm.h rename to libstdc++-v3/include/std/algorithm diff --git a/libstdc++-v3/include/bits/std_bitset.h b/libstdc++-v3/include/std/bitset similarity index 98% rename from libstdc++-v3/include/bits/std_bitset.h rename to libstdc++-v3/include/std/bitset index 67647ced72c..d9119e17b36 100644 --- a/libstdc++-v3/include/bits/std_bitset.h +++ b/libstdc++-v3/include/std/bitset @@ -61,14 +61,14 @@ // important special case where the bitset is only a single word. -#include // for size_t -#include // for memset -#include -#include +#include // for size_t +#include // for memset +#include +#include #include // for invalid_argument, out_of_range, // overflow_error -#include // for ostream (operator<<) -#include // for istream (operator>>) +#include // for ostream (operator<<) +#include // for istream (operator>>) #define _GLIBCPP_BITSET_BITS_PER_WORD (CHAR_BIT*sizeof(unsigned long)) #define __BITSET_WORDS(__n) \ diff --git a/libstdc++-v3/include/std/cassert b/libstdc++-v3/include/std/cassert deleted file mode 100644 index 5cb1e01eed1..00000000000 --- a/libstdc++-v3/include/std/cassert +++ /dev/null @@ -1,41 +0,0 @@ -// -*- C++ -*- std header. - -// Copyright (C) 2001 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 -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -/** @file cassert - * This is a Standard C++ Library file. You should @c #include this file - * in your programs, rather than any of the "st[dl]_*.h" implementation files. - * - * This is the C++ version of the Standard C Library header @c assert.h, - * and its contents are (mostly) the same as that header, but are all - * contained in the namespace @c std. - */ - -// This one should not have include guards. -#include - diff --git a/libstdc++-v3/include/std/cctype b/libstdc++-v3/include/std/cctype deleted file mode 100644 index b5bf9282455..00000000000 --- a/libstdc++-v3/include/std/cctype +++ /dev/null @@ -1,41 +0,0 @@ -// -*- C++ -*- std header. - -// Copyright (C) 2001 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 -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -/** @file cctype - * This is a Standard C++ Library file. You should @c #include this file - * in your programs, rather than any of the "st[dl]_*.h" implementation files. - * - * This is the C++ version of the Standard C Library header @c ctype.h, - * and its contents are (mostly) the same as that header, but are all - * contained in the namespace @c std. - */ - -#ifndef _CPP_CCTYPE -#include -#endif diff --git a/libstdc++-v3/include/std/cerrno b/libstdc++-v3/include/std/cerrno deleted file mode 100644 index 0c1774984ee..00000000000 --- a/libstdc++-v3/include/std/cerrno +++ /dev/null @@ -1,41 +0,0 @@ -// -*- C++ -*- std header. - -// Copyright (C) 2001 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 -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -/** @file cerrno - * This is a Standard C++ Library file. You should @c #include this file - * in your programs, rather than any of the "st[dl]_*.h" implementation files. - * - * This is the C++ version of the Standard C Library header @c errno.h, - * and its contents are (mostly) the same as that header, but are all - * contained in the namespace @c std. - */ - -#ifndef _CPP_CERRNO -#include -#endif diff --git a/libstdc++-v3/include/std/cfloat b/libstdc++-v3/include/std/cfloat deleted file mode 100644 index fa5756daada..00000000000 --- a/libstdc++-v3/include/std/cfloat +++ /dev/null @@ -1,41 +0,0 @@ -// -*- C++ -*- std header. - -// Copyright (C) 2001 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 -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -/** @file cfloat - * This is a Standard C++ Library file. You should @c #include this file - * in your programs, rather than any of the "st[dl]_*.h" implementation files. - * - * This is the C++ version of the Standard C Library header @c float.h, - * and its contents are (mostly) the same as that header, but are all - * contained in the namespace @c std. - */ - -#ifndef _CPP_CFLOAT -#include -#endif diff --git a/libstdc++-v3/include/std/climits b/libstdc++-v3/include/std/climits deleted file mode 100644 index 345ad6140d7..00000000000 --- a/libstdc++-v3/include/std/climits +++ /dev/null @@ -1,41 +0,0 @@ -// -*- C++ -*- std header. - -// Copyright (C) 2001 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 -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -/** @file climits - * This is a Standard C++ Library file. You should @c #include this file - * in your programs, rather than any of the "st[dl]_*.h" implementation files. - * - * This is the C++ version of the Standard C Library header @c limits.h, - * and its contents are (mostly) the same as that header, but are all - * contained in the namespace @c std. - */ - -#ifndef _CPP_CLIMITS -#include -#endif diff --git a/libstdc++-v3/include/std/clocale b/libstdc++-v3/include/std/clocale deleted file mode 100644 index 3775010986a..00000000000 --- a/libstdc++-v3/include/std/clocale +++ /dev/null @@ -1,41 +0,0 @@ -// -*- C++ -*- std header. - -// Copyright (C) 2001 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 -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -/** @file clocale - * This is a Standard C++ Library file. You should @c #include this file - * in your programs, rather than any of the "st[dl]_*.h" implementation files. - * - * This is the C++ version of the Standard C Library header @c locale.h, - * and its contents are (mostly) the same as that header, but are all - * contained in the namespace @c std. - */ - -#ifndef _CPP_CLOCALE -#include -#endif diff --git a/libstdc++-v3/include/std/cmath b/libstdc++-v3/include/std/cmath deleted file mode 100644 index d565307c534..00000000000 --- a/libstdc++-v3/include/std/cmath +++ /dev/null @@ -1,41 +0,0 @@ -// -*- C++ -*- std header. - -// Copyright (C) 2001 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 -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -/** @file cmath - * This is a Standard C++ Library file. You should @c #include this file - * in your programs, rather than any of the "st[dl]_*.h" implementation files. - * - * This is the C++ version of the Standard C Library header @c math.h, - * and its contents are (mostly) the same as that header, but are all - * contained in the namespace @c std. - */ - -#ifndef _CPP_CMATH -#include -#endif diff --git a/libstdc++-v3/include/bits/std_complex.h b/libstdc++-v3/include/std/complex similarity index 99% rename from libstdc++-v3/include/bits/std_complex.h rename to libstdc++-v3/include/std/complex index d07a6b791df..18dd8675823 100644 --- a/libstdc++-v3/include/bits/std_complex.h +++ b/libstdc++-v3/include/std/complex @@ -46,8 +46,8 @@ #include #include -#include -#include +#include +#include namespace std { diff --git a/libstdc++-v3/include/std/csetjmp b/libstdc++-v3/include/std/csetjmp deleted file mode 100644 index daf11b354a8..00000000000 --- a/libstdc++-v3/include/std/csetjmp +++ /dev/null @@ -1,41 +0,0 @@ -// -*- C++ -*- std header. - -// Copyright (C) 2001 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 -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -/** @file csetjmp - * This is a Standard C++ Library file. You should @c #include this file - * in your programs, rather than any of the "st[dl]_*.h" implementation files. - * - * This is the C++ version of the Standard C Library header @c setjmp.h, - * and its contents are (mostly) the same as that header, but are all - * contained in the namespace @c std. - */ - -#ifndef _CPP_CSETJMP -#include -#endif diff --git a/libstdc++-v3/include/std/csignal b/libstdc++-v3/include/std/csignal deleted file mode 100644 index 3790ff51882..00000000000 --- a/libstdc++-v3/include/std/csignal +++ /dev/null @@ -1,41 +0,0 @@ -// -*- C++ -*- std header. - -// Copyright (C) 2001 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 -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -/** @file csignal - * This is a Standard C++ Library file. You should @c #include this file - * in your programs, rather than any of the "st[dl]_*.h" implementation files. - * - * This is the C++ version of the Standard C Library header @c signal.h, - * and its contents are (mostly) the same as that header, but are all - * contained in the namespace @c std. - */ - -#ifndef _CPP_CSIGNAL -#include -#endif diff --git a/libstdc++-v3/include/std/cstdarg b/libstdc++-v3/include/std/cstdarg deleted file mode 100644 index 8dfe625bcae..00000000000 --- a/libstdc++-v3/include/std/cstdarg +++ /dev/null @@ -1,41 +0,0 @@ -// -*- C++ -*- std header. - -// Copyright (C) 2001 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 -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -/** @file cstdarg - * This is a Standard C++ Library file. You should @c #include this file - * in your programs, rather than any of the "st[dl]_*.h" implementation files. - * - * This is the C++ version of the Standard C Library header @c stdarg.h, - * and its contents are (mostly) the same as that header, but are all - * contained in the namespace @c std. - */ - -#ifndef _CPP_CSTDARG -#include -#endif diff --git a/libstdc++-v3/include/std/cstddef b/libstdc++-v3/include/std/cstddef deleted file mode 100644 index 4b3d1f5be78..00000000000 --- a/libstdc++-v3/include/std/cstddef +++ /dev/null @@ -1,41 +0,0 @@ -// -*- C++ -*- std header. - -// Copyright (C) 2001 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 -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -/** @file cstddef - * This is a Standard C++ Library file. You should @c #include this file - * in your programs, rather than any of the "st[dl]_*.h" implementation files. - * - * This is the C++ version of the Standard C Library header @c stddef.h, - * and its contents are (mostly) the same as that header, but are all - * contained in the namespace @c std. - */ - -#ifndef _CPP_CSTDDEF -#include -#endif diff --git a/libstdc++-v3/include/std/cstdio b/libstdc++-v3/include/std/cstdio deleted file mode 100644 index b546585091d..00000000000 --- a/libstdc++-v3/include/std/cstdio +++ /dev/null @@ -1,41 +0,0 @@ -// -*- C++ -*- std header. - -// Copyright (C) 2001 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 -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -/** @file cstdio - * This is a Standard C++ Library file. You should @c #include this file - * in your programs, rather than any of the "st[dl]_*.h" implementation files. - * - * This is the C++ version of the Standard C Library header @c stdio.h, - * and its contents are (mostly) the same as that header, but are all - * contained in the namespace @c std. - */ - -#ifndef _CPP_CSTDIO -#include -#endif diff --git a/libstdc++-v3/include/std/cstdlib b/libstdc++-v3/include/std/cstdlib deleted file mode 100644 index 2feeb533b65..00000000000 --- a/libstdc++-v3/include/std/cstdlib +++ /dev/null @@ -1,41 +0,0 @@ -// -*- C++ -*- std header. - -// Copyright (C) 2001 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 -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -/** @file cstdlib - * This is a Standard C++ Library file. You should @c #include this file - * in your programs, rather than any of the "st[dl]_*.h" implementation files. - * - * This is the C++ version of the Standard C Library header @c stdlib.h, - * and its contents are (mostly) the same as that header, but are all - * contained in the namespace @c std. - */ - -#ifndef _CPP_CSTDLIB -#include -#endif diff --git a/libstdc++-v3/include/std/cstring b/libstdc++-v3/include/std/cstring deleted file mode 100644 index 5652803abd8..00000000000 --- a/libstdc++-v3/include/std/cstring +++ /dev/null @@ -1,41 +0,0 @@ -// -*- C++ -*- std header. - -// Copyright (C) 2001 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 -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -/** @file cstring - * This is a Standard C++ Library file. You should @c #include this file - * in your programs, rather than any of the "st[dl]_*.h" implementation files. - * - * This is the C++ version of the Standard C Library header @c string.h, - * and its contents are (mostly) the same as that header, but are all - * contained in the namespace @c std. - */ - -#ifndef _CPP_CSTRING -#include -#endif diff --git a/libstdc++-v3/include/std/ctime b/libstdc++-v3/include/std/ctime deleted file mode 100644 index e1d6bc9d065..00000000000 --- a/libstdc++-v3/include/std/ctime +++ /dev/null @@ -1,41 +0,0 @@ -// -*- C++ -*- std header. - -// Copyright (C) 2001 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 -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -/** @file ctime - * This is a Standard C++ Library file. You should @c #include this file - * in your programs, rather than any of the "st[dl]_*.h" implementation files. - * - * This is the C++ version of the Standard C Library header @c time.h, - * and its contents are (mostly) the same as that header, but are all - * contained in the namespace @c std. - */ - -#ifndef _CPP_CTIME -#include -#endif diff --git a/libstdc++-v3/include/std/cwchar b/libstdc++-v3/include/std/cwchar deleted file mode 100644 index aa928d72870..00000000000 --- a/libstdc++-v3/include/std/cwchar +++ /dev/null @@ -1,41 +0,0 @@ -// -*- C++ -*- std header. - -// Copyright (C) 2001 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 -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -/** @file cwchar - * This is a Standard C++ Library file. You should @c #include this file - * in your programs, rather than any of the "st[dl]_*.h" implementation files. - * - * This is the C++ version of the Standard C Library header @c wchar.h, - * and its contents are (mostly) the same as that header, but are all - * contained in the namespace @c std. - */ - -#ifndef _CPP_CWCHAR -#include -#endif diff --git a/libstdc++-v3/include/std/cwctype b/libstdc++-v3/include/std/cwctype deleted file mode 100644 index b0de79eeb9d..00000000000 --- a/libstdc++-v3/include/std/cwctype +++ /dev/null @@ -1,41 +0,0 @@ -// -*- C++ -*- std header. - -// Copyright (C) 2001 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 -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -/** @file cwctype - * This is a Standard C++ Library file. You should @c #include this file - * in your programs, rather than any of the "st[dl]_*.h" implementation files. - * - * This is the C++ version of the Standard C Library header @c wctype.h, - * and its contents are (mostly) the same as that header, but are all - * contained in the namespace @c std. - */ - -#ifndef _CPP_CWCTYPE -#include -#endif diff --git a/libstdc++-v3/include/bits/std_deque.h b/libstdc++-v3/include/std/deque similarity index 100% rename from libstdc++-v3/include/bits/std_deque.h rename to libstdc++-v3/include/std/deque diff --git a/libstdc++-v3/include/bits/std_fstream.h b/libstdc++-v3/include/std/fstream similarity index 99% rename from libstdc++-v3/include/bits/std_fstream.h rename to libstdc++-v3/include/std/fstream index 1a651b725e3..350a691d68c 100644 --- a/libstdc++-v3/include/bits/std_fstream.h +++ b/libstdc++-v3/include/std/fstream @@ -41,10 +41,10 @@ #pragma GCC system_header -#include -#include +#include +#include #include -#include // For codecvt +#include // For codecvt #include namespace std diff --git a/libstdc++-v3/include/bits/std_functional.h b/libstdc++-v3/include/std/functional similarity index 98% rename from libstdc++-v3/include/bits/std_functional.h rename to libstdc++-v3/include/std/functional index 82863cc3e3c..16702caead1 100644 --- a/libstdc++-v3/include/bits/std_functional.h +++ b/libstdc++-v3/include/std/functional @@ -51,7 +51,7 @@ #pragma GCC system_header #include -#include +#include #include #endif /* _CPP_FUNCTIONAL */ diff --git a/libstdc++-v3/include/bits/std_iomanip.h b/libstdc++-v3/include/std/iomanip similarity index 98% rename from libstdc++-v3/include/bits/std_iomanip.h rename to libstdc++-v3/include/std/iomanip index ac83db39a63..ab279d20ab6 100644 --- a/libstdc++-v3/include/bits/std_iomanip.h +++ b/libstdc++-v3/include/std/iomanip @@ -42,8 +42,8 @@ #pragma GCC system_header #include -#include -#include +#include +#include namespace std { diff --git a/libstdc++-v3/include/std/ios b/libstdc++-v3/include/std/ios index a017dd894be..1e61c366d4e 100644 --- a/libstdc++-v3/include/std/ios +++ b/libstdc++-v3/include/std/ios @@ -1,6 +1,6 @@ -// -*- C++ -*- std header. +// Iostreams base classes -*- C++ -*- -// Copyright (C) 2001 Free Software Foundation, Inc. +// Copyright (C) 1997, 1998, 1999, 2001 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 @@ -27,11 +27,28 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -/** @file ios - * This is a Standard C++ Library file. You should @c #include this file - * in your programs, rather than any of the "st[dl]_*.h" implementation files. +// +// ISO C++ 14882: 27.4 Iostreams base classes +// + +/** @file std_ios.h + * This is an internal header file, included by other library headers. + * You should not attempt to use it directly. */ #ifndef _CPP_IOS -#include -#endif +#define _CPP_IOS 1 + +#pragma GCC system_header + +#include +#include // For ios_base::failure +#include // For char_traits, streamoff, streamsize, fpos +#include // For SEEK_SET, SEEK_CUR, SEEK_END +#include // For class locale +#include // For ios_base declarations. +#include +#include + +#endif /* _CPP_IOS */ + diff --git a/libstdc++-v3/include/bits/std_iosfwd.h b/libstdc++-v3/include/std/iosfwd similarity index 100% rename from libstdc++-v3/include/bits/std_iosfwd.h rename to libstdc++-v3/include/std/iosfwd diff --git a/libstdc++-v3/include/bits/std_iostream.h b/libstdc++-v3/include/std/iostream similarity index 97% rename from libstdc++-v3/include/bits/std_iostream.h rename to libstdc++-v3/include/std/iostream index 32893fa55cc..47b83798f5d 100644 --- a/libstdc++-v3/include/bits/std_iostream.h +++ b/libstdc++-v3/include/std/iostream @@ -42,8 +42,8 @@ #pragma GCC system_header #include -#include -#include +#include +#include namespace std { diff --git a/libstdc++-v3/include/bits/std_istream.h b/libstdc++-v3/include/std/istream similarity index 99% rename from libstdc++-v3/include/bits/std_istream.h rename to libstdc++-v3/include/std/istream index 4afbbc0528d..7b5185289b2 100644 --- a/libstdc++-v3/include/bits/std_istream.h +++ b/libstdc++-v3/include/std/istream @@ -41,8 +41,8 @@ #pragma GCC system_header -#include -#include // For numeric_limits +#include +#include // For numeric_limits namespace std { diff --git a/libstdc++-v3/include/bits/std_iterator.h b/libstdc++-v3/include/std/iterator similarity index 97% rename from libstdc++-v3/include/bits/std_iterator.h rename to libstdc++-v3/include/std/iterator index 3e3541c6089..f0eee1164ba 100644 --- a/libstdc++-v3/include/bits/std_iterator.h +++ b/libstdc++-v3/include/std/iterator @@ -63,12 +63,12 @@ #pragma GCC system_header #include -#include +#include #include #include #include -#include -#include +#include +#include #include #include diff --git a/libstdc++-v3/include/bits/std_limits.h b/libstdc++-v3/include/std/limits similarity index 100% rename from libstdc++-v3/include/bits/std_limits.h rename to libstdc++-v3/include/std/limits diff --git a/libstdc++-v3/include/bits/std_list.h b/libstdc++-v3/include/std/list similarity index 100% rename from libstdc++-v3/include/bits/std_list.h rename to libstdc++-v3/include/std/list diff --git a/libstdc++-v3/include/std/locale b/libstdc++-v3/include/std/locale index 5a1d62241e7..82089d01539 100644 --- a/libstdc++-v3/include/std/locale +++ b/libstdc++-v3/include/std/locale @@ -1,6 +1,6 @@ -// -*- C++ -*- std header. +// Locale support -*- C++ -*- -// Copyright (C) 2001 Free Software Foundation, Inc. +// Copyright (C) 1997-1999 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 @@ -27,11 +27,26 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -/** @file locale - * This is a Standard C++ Library file. You should @c #include this file - * in your programs, rather than any of the "st[dl]_*.h" implementation files. +// +// ISO C++ 14882: 22.1 Locales +// + +/** @file std_locale.h + * This is an internal header file, included by other library headers. + * You should not attempt to use it directly. */ #ifndef _CPP_LOCALE -#include +#define _CPP_LOCALE 1 + +#pragma GCC system_header + +#include +#include +#include + #endif + +// Local Variables: +// mode:c++ +// End: diff --git a/libstdc++-v3/include/bits/std_map.h b/libstdc++-v3/include/std/map similarity index 100% rename from libstdc++-v3/include/bits/std_map.h rename to libstdc++-v3/include/std/map diff --git a/libstdc++-v3/include/bits/std_memory.h b/libstdc++-v3/include/std/memory similarity index 100% rename from libstdc++-v3/include/bits/std_memory.h rename to libstdc++-v3/include/std/memory diff --git a/libstdc++-v3/include/bits/std_numeric.h b/libstdc++-v3/include/std/numeric similarity index 97% rename from libstdc++-v3/include/bits/std_numeric.h rename to libstdc++-v3/include/std/numeric index 097c9c35b4b..e7a6adc3ad4 100644 --- a/libstdc++-v3/include/bits/std_numeric.h +++ b/libstdc++-v3/include/std/numeric @@ -63,8 +63,8 @@ #pragma GCC system_header #include -#include -#include +#include +#include #include #include diff --git a/libstdc++-v3/include/bits/std_ostream.h b/libstdc++-v3/include/std/ostream similarity index 99% rename from libstdc++-v3/include/bits/std_ostream.h rename to libstdc++-v3/include/std/ostream index c1c79db7fb0..e3ec3260ec0 100644 --- a/libstdc++-v3/include/bits/std_ostream.h +++ b/libstdc++-v3/include/std/ostream @@ -41,7 +41,7 @@ #pragma GCC system_header -#include +#include namespace std { diff --git a/libstdc++-v3/include/bits/std_queue.h b/libstdc++-v3/include/std/queue similarity index 100% rename from libstdc++-v3/include/bits/std_queue.h rename to libstdc++-v3/include/std/queue diff --git a/libstdc++-v3/include/bits/std_set.h b/libstdc++-v3/include/std/set similarity index 100% rename from libstdc++-v3/include/bits/std_set.h rename to libstdc++-v3/include/std/set diff --git a/libstdc++-v3/include/bits/std_sstream.h b/libstdc++-v3/include/std/sstream similarity index 99% rename from libstdc++-v3/include/bits/std_sstream.h rename to libstdc++-v3/include/std/sstream index d36070a8abe..fb909862a1e 100644 --- a/libstdc++-v3/include/bits/std_sstream.h +++ b/libstdc++-v3/include/std/sstream @@ -41,8 +41,8 @@ #pragma GCC system_header -#include -#include +#include +#include namespace std { diff --git a/libstdc++-v3/include/bits/std_stack.h b/libstdc++-v3/include/std/stack similarity index 100% rename from libstdc++-v3/include/bits/std_stack.h rename to libstdc++-v3/include/std/stack diff --git a/libstdc++-v3/include/bits/std_stdexcept.h b/libstdc++-v3/include/std/stdexcept similarity index 100% rename from libstdc++-v3/include/bits/std_stdexcept.h rename to libstdc++-v3/include/std/stdexcept diff --git a/libstdc++-v3/include/bits/std_streambuf.h b/libstdc++-v3/include/std/streambuf similarity index 99% rename from libstdc++-v3/include/bits/std_streambuf.h rename to libstdc++-v3/include/std/streambuf index 8ef20ff4cfb..59f70705361 100644 --- a/libstdc++-v3/include/bits/std_streambuf.h +++ b/libstdc++-v3/include/std/streambuf @@ -42,8 +42,8 @@ #pragma GCC system_header #include -#include -#include // For SEEK_SET, SEEK_CUR, SEEK_END +#include +#include // For SEEK_SET, SEEK_CUR, SEEK_END #include #include diff --git a/libstdc++-v3/include/bits/std_string.h b/libstdc++-v3/include/std/string similarity index 92% rename from libstdc++-v3/include/bits/std_string.h rename to libstdc++-v3/include/std/string index d93fa202d23..9cdc533e4a2 100644 --- a/libstdc++-v3/include/bits/std_string.h +++ b/libstdc++-v3/include/std/string @@ -44,15 +44,15 @@ #include #include #include -#include // For allocator. +#include // For allocator. #include -#include // For operators >>, <<, and getline decls. +#include // For operators >>, <<, and getline decls. #include #include // For less #include #ifdef _GLIBCPP_NO_TEMPLATE_EXPORT -# include // for find_if +# include // for find_if # include #endif diff --git a/libstdc++-v3/include/bits/std_utility.h b/libstdc++-v3/include/std/utility similarity index 100% rename from libstdc++-v3/include/bits/std_utility.h rename to libstdc++-v3/include/std/utility diff --git a/libstdc++-v3/include/bits/std_valarray.h b/libstdc++-v3/include/std/valarray similarity index 99% rename from libstdc++-v3/include/bits/std_valarray.h rename to libstdc++-v3/include/std/valarray index 5f4c112f8e9..a3547080ed3 100644 --- a/libstdc++-v3/include/bits/std_valarray.h +++ b/libstdc++-v3/include/std/valarray @@ -40,12 +40,12 @@ #pragma GCC system_header #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace std { diff --git a/libstdc++-v3/include/bits/std_vector.h b/libstdc++-v3/include/std/vector similarity index 100% rename from libstdc++-v3/include/bits/std_vector.h rename to libstdc++-v3/include/std/vector diff --git a/libstdc++-v3/src/bitset.cc b/libstdc++-v3/src/bitset.cc index 0c3fc5f4073..c0bec5d5b34 100644 --- a/libstdc++-v3/src/bitset.cc +++ b/libstdc++-v3/src/bitset.cc @@ -41,7 +41,7 @@ * purpose. It is provided "as is" without express or implied warranty. */ -#include +#include // // Definitions of non-inline functions from the single-word version of diff --git a/libstdc++-v3/src/cmath.cc b/libstdc++-v3/src/cmath.cc index 6442e0cda4e..7a7433a1cf3 100644 --- a/libstdc++-v3/src/cmath.cc +++ b/libstdc++-v3/src/cmath.cc @@ -32,7 +32,7 @@ // helper functions used in the math routines of libstdc++. -#include +#include namespace std { @@ -45,4 +45,3 @@ namespace std __cmath_power(long double, unsigned int); } // namespace std - diff --git a/libstdc++-v3/src/codecvt.cc b/libstdc++-v3/src/codecvt.cc index 5e7cdb69bdb..c5474c6c7a7 100644 --- a/libstdc++-v3/src/codecvt.cc +++ b/libstdc++-v3/src/codecvt.cc @@ -27,7 +27,7 @@ // Written by Benjamin Kosnik -#include +#include namespace std { diff --git a/libstdc++-v3/src/complex_io.cc b/libstdc++-v3/src/complex_io.cc index c4b8a95b5f8..a6d502f2dad 100644 --- a/libstdc++-v3/src/complex_io.cc +++ b/libstdc++-v3/src/complex_io.cc @@ -27,7 +27,7 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include +#include namespace std { @@ -91,6 +91,3 @@ namespace std const complex&); #endif //_GLIBCPP_USE_WCHAR_T } // namespace std - - - diff --git a/libstdc++-v3/src/concept-inst.cc b/libstdc++-v3/src/concept-inst.cc index 28cf104adbd..11e4a89a831 100644 --- a/libstdc++-v3/src/concept-inst.cc +++ b/libstdc++-v3/src/concept-inst.cc @@ -39,15 +39,14 @@ #ifdef _GLIBCPP_CONCEPT_CHECKS -#include -#include -#include +#include +#include +#include #define _Instantiate(...) template void __function_requires< __VA_ARGS__ > () namespace __gnu_cxx { - template void __aux_require_boolean_expr(bool const&); _Instantiate(_BidirectionalIteratorConcept< @@ -160,5 +159,3 @@ namespace __gnu_cxx #undef _Instantiate #endif - - diff --git a/libstdc++-v3/src/ios.cc b/libstdc++-v3/src/ios.cc index 90379fb8845..6ca59572fba 100644 --- a/libstdc++-v3/src/ios.cc +++ b/libstdc++-v3/src/ios.cc @@ -31,10 +31,10 @@ // ISO C++ 14882: 27.4 Iostreams base classes // -#include -#include -#include -#include +#include +#include +#include +#include namespace std { diff --git a/libstdc++-v3/src/limits.cc b/libstdc++-v3/src/limits.cc index cf3ddaee00e..3fc3dcb8fb3 100644 --- a/libstdc++-v3/src/limits.cc +++ b/libstdc++-v3/src/limits.cc @@ -34,7 +34,7 @@ // 18.2.1 // -#include +#include namespace std { diff --git a/libstdc++-v3/src/locale-inst.cc b/libstdc++-v3/src/locale-inst.cc index 2cbd5065377..e2f6d7764fe 100644 --- a/libstdc++-v3/src/locale-inst.cc +++ b/libstdc++-v3/src/locale-inst.cc @@ -31,17 +31,16 @@ // ISO C++ 14882: 22.1 Locales // -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include namespace std { diff --git a/libstdc++-v3/src/locale.cc b/libstdc++-v3/src/locale.cc index 13c85aba587..630805ee0fa 100644 --- a/libstdc++-v3/src/locale.cc +++ b/libstdc++-v3/src/locale.cc @@ -25,20 +25,20 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include // for auto_ptr +#include +#include +#include +#include +#include +#include // for auto_ptr #ifdef _GLIBCPP_USE_WCHAR_T -# include // for towupper, etc. +# include // for towupper, etc. #endif namespace std diff --git a/libstdc++-v3/src/localename.cc b/libstdc++-v3/src/localename.cc index 8c2db9da7c8..45c4732d007 100644 --- a/libstdc++-v3/src/localename.cc +++ b/libstdc++-v3/src/localename.cc @@ -25,11 +25,11 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace std { diff --git a/libstdc++-v3/src/misc-inst.cc b/libstdc++-v3/src/misc-inst.cc index ab2f2aa6385..bb0bd78da93 100644 --- a/libstdc++-v3/src/misc-inst.cc +++ b/libstdc++-v3/src/misc-inst.cc @@ -31,20 +31,18 @@ // ISO C++ 14882: // -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // NB: unnecessary if the .h headers include these #ifndef _GLIBCPP_FULLY_COMPLIANT_HEADERS diff --git a/libstdc++-v3/src/stdexcept.cc b/libstdc++-v3/src/stdexcept.cc index 32ebd265f89..d39d41ffef6 100644 --- a/libstdc++-v3/src/stdexcept.cc +++ b/libstdc++-v3/src/stdexcept.cc @@ -31,8 +31,8 @@ // ISO C++ 14882: 19.1 Exception classes // -#include -#include +#include +#include namespace std { diff --git a/libstdc++-v3/src/stl-inst.cc b/libstdc++-v3/src/stl-inst.cc index bc1246488ec..52661dfc2e5 100644 --- a/libstdc++-v3/src/stl-inst.cc +++ b/libstdc++-v3/src/stl-inst.cc @@ -32,13 +32,12 @@ // #include -#include -#include -#include +#include +#include +#include namespace std { - template class __malloc_alloc_template<0>; #ifndef __USE_MALLOC @@ -51,4 +50,3 @@ namespace std _M_insert_aux(vector::iterator, unsigned int const &); } // namespace std - diff --git a/libstdc++-v3/src/string-inst.cc b/libstdc++-v3/src/string-inst.cc index 324ca86967a..4da060fefb2 100644 --- a/libstdc++-v3/src/string-inst.cc +++ b/libstdc++-v3/src/string-inst.cc @@ -33,7 +33,7 @@ // Written by Jason Merrill based upon the specification by Takanori Adachi // in ANSI X3J16/94-0013R2. Rewritten by Nathan Myers. -#include +#include // Instantiation configuration. #ifndef C diff --git a/libstdc++-v3/src/valarray-inst.cc b/libstdc++-v3/src/valarray-inst.cc index c5f56164d11..b56a911dcd9 100644 --- a/libstdc++-v3/src/valarray-inst.cc +++ b/libstdc++-v3/src/valarray-inst.cc @@ -31,7 +31,7 @@ // ISO C++ 14882: // -#include +#include namespace std { -- 2.11.4.GIT