diff options
| author | Zack Weinberg <zack@gcc.gnu.org> | 2002-12-16 18:23:00 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2002-12-16 18:23:00 +0000 |
| commit | 4977bab6ed59f01c73f9c8b9e92298706df9b6d5 (patch) | |
| tree | c259697c448b0c6f548f153c48c46a8d7a75970f /libstdc++-v3 | |
| parent | b51dc045004ee7eb8d2bf4358ddf22a6cc6c1d00 (diff) | |
| download | gcc-4977bab6ed59f01c73f9c8b9e92298706df9b6d5.tar.gz | |
Merge basic-improvements-branch to trunk
From-SVN: r60174
Diffstat (limited to 'libstdc++-v3')
27 files changed, 294 insertions, 188 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ee8cdb3cd16..d8145904801 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -24,10 +24,113 @@ * testsuite/abi_check.cc: Add GLIBCPP_3.2.2. +2002-12-04 Paolo Carlini <pcarlini@unitus.it> + + * config/locale/generic/codecvt_members.cc (codecvt::do_out + (state_type&, const intern_type*, const intern_type*, + const intern_type*&, extern_type*, extern_type*, extern_type*&), + codecvt::do_in(state_type&, const extern_type*, const extern_type*, + const extern_type*&, intern_type*, intern_type*, intern_type*&)): + Fully qualify min() with std::. + * config/locale/gnu/codecvt_members.cc: Ditto. + * locale/ieee_1003.1-2001/codecvt_specializations.h + (codecvt::do_length(const state_type&, const extern_type*, + const extern_type*, size_t): Ditto. + * include/bits/deque.tcc + (_M_range_initialize(_ForwardIterator, _ForwardIterator, + forward_iterator_tag), deque::_M_range_insert_aux(iterator, + _ForwardIterator, _ForwardIterator, forward_iterator_tag), + deque::_M_reallocate_map(size_type, bool)): Fully qualify + distance() and max() with std::. + * include/bits/fstream.tcc (basic_filebuf::seekoff(off_type, + ios_base::seekdir, ios_base::openmode)): Fully qualify max() + with std::. + * include/bits/istream.tcc (basic_istream::ignore(streamsize, + int_type), basic_istream::readsome(char_type*, streamsize)): + Fully qualify min() with std::. + * include/bits/locale_facets.tcc (time_get::_M_extract_name + (iter_type&, iter_type&, int&, const _CharT**, size_t, + ios_base::iostate&)): Ditto. + * include/bits/sstream.tcc (basic_stringbuf::overflow(int_type)): + Fully qualify max() with std::. + * include/bits/stl_algo.h (__inplace_stable_partition(_ForwardIter + __first, _ForwardIter, _Predicate, _Distance), + __stable_partition_adaptive(_ForwardIter, _ForwardIter, _Predicate, + _Distance, _Pointer, _Distance), __merge_sort_loop(_RandomAccessIter1, + _RandomAccessIter1, _RandomAccessIter2, _Distance), + __merge_sort_loop(_RandomAccessIter1, _RandomAccessIter1, + _RandomAccessIter2, _Distance, _Compare), lower_bound(_ForwardIter, + _ForwardIter, const _Tp&), lower_bound(_ForwardIter, _ForwardIter, + const _Tp&, _Compare), upper_bound(_ForwardIter, _ForwardIter, + const _Tp&), upper_bound(_ForwardIter, _ForwardIter, const _Tp&, + _Compare), equal_range(_ForwardIter, _ForwardIter, const _Tp&), + equal_range(_ForwardIter, _ForwardIter, const _Tp&, _Compare), + __merge_without_buffer(_BidirectionalIter, _BidirectionalIter, + _BidirectionalIter, _Distance, _Distance), __merge_without_buffer + (_BidirectionalIter, _BidirectionalIter, _BidirectionalIter, + _Distance, _Distance, _Compare), __rotate_adaptive(_BidirectionalIter1, + _BidirectionalIter1, _BidirectionalIter1, _Distance, _Distance, + _BidirectionalIter2, _Distance), __merge_adaptive(_BidirectionalIter, + _BidirectionalIter, _BidirectionalIter, _Distance, _Distance, + _Pointer, _Distance), __merge_adaptive(_BidirectionalIter, + _BidirectionalIter, _BidirectionalIter, _Distance, _Distance, + _Pointer, _Distance, _Compare), inplace_merge(_BidirectionalIter, + _BidirectionalIter, _BidirectionalIter), inplace_merge + (_BidirectionalIter, _BidirectionalIter, _BidirectionalIter, + _Compare), __find_end(_BidirectionalIter1, _BidirectionalIter1, + _BidirectionalIter2, _BidirectionalIter2, bidirectional_iterator_tag, + bidirectional_iterator_tag), __find_end(_BidirectionalIter1, + _BidirectionalIter1, _BidirectionalIter2, _BidirectionalIter2, + bidirectional_iterator_tag, bidirectional_iterator_tag, + _BinaryPredicate)): Fully qualify distance() and min() with std::. + * include/bits/stl_algobase.h (lexicographical_compare + (const unsigned char*, const unsigned char*, const unsigned char*, + const unsigned char*)): Fully qualify min() with std::. + * include/bits/stl_bvector.h (_M_insert_range(iterator, + _ForwardIterator, _ForwardIterator, forward_iterator_tag), + _M_assign_aux(_ForwardIterator, _ForwardIterator, forward_iterator_tag), + _M_initialize_range(_ForwardIterator, _ForwardIterator, + forward_iterator_tag), _M_fill_insert(iterator, size_type, bool)): + Fully qualify distance() and max() with std::. + * include/bits/stl_deque.h (_Deque_base::_M_initialize_map(size_t), + _M_assign_aux(_ForwardIterator, _ForwardIterator, forward_iterator_tag)): + Ditto. + * include/bits/stl_list.h (size()): Fully qualify distance() with std::. + * include/bits/stl_tempbuf.h (_Temporary_buffer::_Temporary_buffer + (_ForwardIterator, _ForwardIterator)): Ditto. + * include/bits/stl_tree.h (_Rb_tree::erase(const _Key&), + _Rb_tree::count(const _Key&)): Ditto. + * include/bits/stl_vector.h (_M_range_initialize(_ForwardIterator, + _ForwardIterator, forward_iterator_tag)): Ditto. + * include/bits/streambuf.tcc (basic_streambuf::xsgetn(char_type*, + streamsize), basic_streambuf::xsputn(const char_type*, streamsize)): + Fully qualify min() with std::. + * include/bits/vector.tcc (_M_assign_aux(_ForwardIter, _ForwardIter, + forward_iterator_tag), _M_fill_insert(iterator, size_type, + const value_type&), _M_range_insert(iterator, _ForwardIterator, + _ForwardIterator, forward_iterator_tag)): Fully qualify max() and + distance() with std::. + * include/std/std_bitset.h (bitset::_M_copy_from_string + (const basic_string&, size_t, size_t)): Fully qualify min() with std::. + * include/std/std_streambuf.h (_M_pback_create()): Ditto. + * include/std/std_complex.h (abs(const complex<_Tp>&)): + Fully qualify max() with std::. + * include/std/std_sstream.h (str()): Ditto. + * src/codecvt.cc (codecvt::do_out(state_type&, const intern_type*, + const intern_type*, const intern_type*&, extern_type*, extern_type*, + extern_type*&), codecvt::do_in(state_type&, const extern_type*, + const extern_type*, const extern_type*&, intern_type*, intern_type*, + intern_type*&), codecvt::do_length(const state_type&, + const extern_type*, const extern_type*, size_t), do_length + (const state_type&, const extern_type*, const extern_type*, + size_t)): Fully qualify min() with std::. + * src/strstream.cc (strstreambuf::strstreambuf(streamsize), + strstreambuf::overflow(int_type)): Fully qualify max() with std::. + 2002-12-02 Paolo Carlini <pcarlini@unitus.it> * include/bits/basic_string.h (compare(const basic_string&)): - Fully qualify min() with std::. + Fully qualify min() with std::. 2002-12-02 Benjamin Kosnik <bkoz@redhat.com> @@ -46,7 +149,7 @@ basic_string::compare(size_type, size_type, const _CharT*, size_type), _S_string_copy(const basic_string&, _CharT*, typename _Alloc::size_type)): Fully qualify min() with std::. - + 2002-12-02 Paolo Carlini <pcarlini@unitus.it> * include/bits/basic_string.tcc @@ -67,7 +170,7 @@ * docs/html/faq/index.html: Add tip about a namespace for extensions. 2002-11-28 Paolo Carlini <pcarlini@unitus.it> - Nathan Myers <ncm@cantrip.org> + Nathan Myers <ncm@cantrip.org> * src/localename.cc (locale::_Impl::_Impl(const char*, size_t)): @@ -87,7 +190,7 @@ __cxa_guard_release, __cxa_guard_abort in CXXABI_1.2.1. 2002-11-25 Paolo Carlini <pcarlini@unitus.it> - Nathan Myers <ncm@cantrip.org> + Nathan Myers <ncm@cantrip.org> * src/localename.cc (locale::_Impl::_Impl(const char*, size_t)): @@ -127,7 +230,7 @@ Trivial cosmetic tweaks. 2002-11-22 Laszlo Ersek <erseklaszlo@chello.hu> - Paolo Carlini <pcarlini@unitus.it> + Paolo Carlini <pcarlini@unitus.it> PR libstdc++/8645 * include/bits/stl_tree.h (_Rb_tree_rebalance_for_erase): @@ -180,7 +283,7 @@ include/std/std_streambuf.h: Doxygenate all I/O entities. 2002-11-20 Benjamin Kosnik <bkoz@redhat.com> - Jonathan Lennox <lennox@cs.columbia.edu> + Jonathan Lennox <lennox@cs.columbia.edu> * include/bits/streambuf.tcc (__copy_streambufs): Revert previous fix for the interactive half of @@ -220,7 +323,7 @@ and std::codecvt<wchar_t>::codecvt(size_t) into one export pattern. 2002-11-15 Benjamin Kosnik <bkoz@redhat.com> - Gabriel Dos Reis <gdr@integrable-solutions.net> + Gabriel Dos Reis <gdr@integrable-solutions.net> PR libstdc++/8230 * include/bits/stl_alloc.h: Use builtin_expect for the most @@ -228,16 +331,16 @@ (__default_alloc_template::allocate): Check for null, throw bad_alloc. * include/bits/vector.tcc: Formatting tweaks. - * include/bits/stl_vector.h: Same. + * include/bits/stl_vector.h: Same. * testsuite/20_util/allocator_members.cc (test02): Add. * testsuite/23_containers/vector_capacity.cc (test03): Add. - + 2002-11-15 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> * src/ios.cc [_GLIBCPP_HAVE_UNISTD_H]: Include unistd.h. 2002-11-15 Paolo Carlini <pcarlini@unitus.it> - Loren J. Rittle <ljrittle@acm.org> + Loren J. Rittle <ljrittle@acm.org> PR libstdc++/8399 * acinclude.m4 @@ -258,11 +361,11 @@ * acconfig.h (HAVE_DRAND48): Add. (HAVE_GETPAGESIZE): Add. - (HAVE_SETENV): Add. - (HAVE_SIGSETJMP): Add. + (HAVE_SETENV): Add. + (HAVE_SIGSETJMP): Add. * config.h.in: Regenerate. * configure: Regenerate. - + 2002-11-13 John David Anglin <dave@hiauly1.hia.nrc.ca> * config/os/hpux/os_defines.h (_GLIBCPP_INST_ATOMICITY_LOCK): Define @@ -275,7 +378,7 @@ requested size is bigger than max_size(). * include/bits/stl_bvector.h (vector<bool>::reserve): Same. * testsuite/23_containers/vector_capacity.cc (test02): Add. - + 2002-11-13 Benjamin Kosnik <bkoz@redhat.com> * config/linker-map.gnu: Export all _S_construct. @@ -290,15 +393,15 @@ * docs/html/install.html, docs/html/22_locale/locale.html: HTML fix. 2002-11-11 Benjamin Kosnik <bkoz@redhat.com> - - PR libstdc++/6746 - * include/bits/fstream.tcc (filebuf::open): Set input pointers. + + PR libstdc++/6746 + * include/bits/fstream.tcc (filebuf::open): Set input pointers. * config/io/basic_file_stdio.cc (__basic_file::_M_open_mode): Set __p_mode as well. (__basic_file::open): Set to non-block for input. * testsuite/27_io/istream_unformatted.cc (test12): Add. (test13): Same. - + 2002-11-11 Jonathan Wakely <redi@gcc.gnu.org> * docs/html/17_intro/howto.html: Make "chapter 22 notes" a link. @@ -313,7 +416,7 @@ docs/html/ext/sgiexts.html: Add missing <html> tag. 2002-11-07 Phil Edwards <pme@gcc.gnu.org> - Richard Earnshaw <rearnsha@arm.com> + Richard Earnshaw <rearnsha@arm.com> * config/cpu/generic/atomicity.h: Provide atomic __exchange_and_add and __atomic_add. @@ -341,9 +444,9 @@ for null buffer. (istream::operator>>(_CharT*)): Use traits_type. (istream::ws): Same. - (istream::operator>>(string)): Same. + (istream::operator>>(string)): Same. * testsuite/27_io/istream_unformatted.cc (test11): Add. - + 2002-11-05 Paolo Carlini <pcarlini@unitus.it> PR libstdc++/8466 @@ -371,7 +474,7 @@ * config/linker-map.gnu: Export string operator+. Export __default_alloc_template::_S_force_new. * testsuite/abi_check.cc: Output tweaks. - + 2002-11-01 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/8172 @@ -382,17 +485,17 @@ PR libstdc++/7926 * configure.target: Simplify. * config/cpu/i386/atomicity.h: Remove. - * config/cpu/i386: Remove. + * config/cpu/i386: Remove. * config/cpu/arm/atomicity.h: Remove. - * config/cpu/arm: Remove. + * config/cpu/arm: Remove. * config/cpu/x86-64/atomicity.h: Remove. - * config/cpu/x86-64: Remove. - + * config/cpu/x86-64: Remove. + 2002-11-01 Christian Ehrhardt <ehrhardt@mathematik.uni-ulm.de> PR libstdc++/8197 * config/link-map.gnu: Export math stubbs. - + 2002-11-01 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/8318 @@ -406,20 +509,24 @@ * include/bits/basic_ios.tcc: Same. * include/bits/streambuf.tcc: Same. * include/bits/locale_facets.tcc: Same. - + 2002-11-01 John Carter <john.carter@tait.co.nz> PR libstdc++/7961 * include/bits/basic_string.tcc (compare(const _CharT* __s)): Don't access __s past its length. +2002-10-31 Zack Weinberg <zack@codesourcery.com> + + * libsupc++/eh_globals.cc: Don't call __gthread_key_dtor. + 2002-10-31 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/8348 * include/bits/istream.tcc (istream::tellg): Remove sentry bits. (istream::seekg): Same. * testsuite/27_io/istream_seeks.cc (test06): New. - + 2002-10-28 Jason Thorpe <thorpej@wasabisystems.com> * testsuite/thread/pthread5.cc: Include <unistd.h> @@ -481,7 +588,7 @@ for FreeBSD 5. 2002-10-18 Loren J. Rittle <ljrittle@acm.org> - Brad Spencer <spencer@infointeractive.com> + Brad Spencer <spencer@infointeractive.com> (provided alternate patch and improvements) * docs/html/23_containers/howto.html (GLIBCPP_FORCE_NEW): Document @@ -546,21 +653,21 @@ c_locale_impl. * testsuite/abi_check.cc (line_to_symbol_info): Collect size info. * docs/html/abi.txt: Update. - + 2002-10-14 Benjamin Kosnik <bkoz@redhat.com> * testsuite/22_locale/static_members.cc (test02): Less provincial. 2002-10-14 Benjamin Kosnik <bkoz@redhat.com> - * testsuite/22_locale/static_members.cc (test02): Disable for + * testsuite/22_locale/static_members.cc (test02): Disable for systems without named locale support. * testsuite/22_locale/ctor_copy_dtor.cc (test04): Don't assume running the testsuites in "C" environment. Add new tests. * docs/html/22_locale/locale.html: Update. -2002-10-13 Danny Smith <dannysmith@users.sourceforge.net> +2002-10-13 Danny Smith <dannysmith@users.sourceforge.net> * include/bits/stl_threads.h (_GLIBCPP_mutex, _GLIBCPP_mutex_init,_GLIBCPP_mutex_address, @@ -580,7 +687,7 @@ * testsuite/22_locale/static_members.cc (test02): Avoid null strings. 2002-10-12 Jonathan Wakely <jw@kayari.org> - Gabriel Dos Reis <gdr@integrable-solutions.net> + Gabriel Dos Reis <gdr@integrable-solutions.net> * docs/html/21_strings/howto.html#5: Correct nasting of XHTML elements. Correct allocator-related text. @@ -601,19 +708,19 @@ hack around m4 issues with quoting '@'. * src/locale.cc: Use _GLIBCPP_ASM_SYMVER. * src/globals.cc: Same. - + * testsuite/22_locale/ctor_copy_dtor.cc (test04): Fix for non-glibc systems. 2002-10-10 Benjamin Kosnik <bkoz@redhat.com> * config/linker-map.gnu (GLIBCPP_3.2.1): Add. - (GLIBCPP_3.2): Don't export locale::_S_*. + (GLIBCPP_3.2): Don't export locale::_S_*. * src/ios.cc: Move globals into __gnu_cxx. Make old exported symbols match. * src/locale.cc: Same. - * src/localename.cc: Same. - * src/globals.cc: Same. + * src/localename.cc: Same. + * src/globals.cc: Same. 2002-10-10 Phil Edwards <pme@gcc.gnu.org> @@ -621,7 +728,7 @@ * docs/html/17_intro/porting.texi: Expand on os_include_dir. * docs/html/17_intro/porting.html: Regenerate. -2002-10-09 Benjamin Kosnik <bkoz@redhat.com> +2002-10-09 Benjamin Kosnik <bkoz@redhat.com> * src/locale.cc: Fix comments, move ctors together. * testsuite/22_locale/static_members.cc (test03): Add. @@ -632,9 +739,9 @@ * streambuf.tcc (__copy_streambufs): Handle cases where __sbin->in_avail() returns 0, or where __sbin doesn't set gptr(). * testsuite/27_io/ostream_inserter_other.cc (test05): Add. - + 2002-10-08 Paolo Carlini <pcarlini@unitus.it> - Benjamin Kosnik <bkoz@redhat.com> + Benjamin Kosnik <bkoz@redhat.com> * include/bits/localefwd.h (class locale): Add static member _S_num_extra_categories, encoding the number of additional @@ -664,7 +771,7 @@ * src/codecvt.c: _S_c_locale simplification. * src/ctype.c: Same. * src/globals.cc: Add fake_name. - * src/locale-inst.cc: Remove extra includes. + * src/locale-inst.cc: Remove extra includes. * src/locale.cc: Remove extra includes. Add _S_extra_categories_size definition. Correct "C" initialization. @@ -679,7 +786,7 @@ * config/locale/generic/c_locale.cc: Add _S_categories definition. * config/locale/generic/c_locale.h: Add _GLIBCPP_NUM_CATEGORIES macro. * config/locale/generic/time_members.cc: _S_c_locale cleanup. - + * config/locale/gnu/c_locale.cc: Add _S_categories definition. (_S_destroy_c_locale): Move checks against _S_c_locale here. * config/locale/gnu/c_locale.h: Add _GLIBCPP_NUM_CATEGORIES macro. @@ -687,7 +794,7 @@ calls, _S_c_locale usage. * config/locale/gnu/monetary_members.cc: Same, tweaks. * config/locale/gnu/monetary_members.cc: Same. - * config/locale/gnu/time_members.cc: Same. + * config/locale/gnu/time_members.cc: Same. * config/os/gnu-linux/ctype_noninline.h: Use locale::classic(). * docs/html/22_locale/locale.html: Add bits about global locales @@ -765,7 +872,7 @@ (__glibcpp_long_double_bits): Remove. (__glibcpp_long_bits): Remove. * config/os/hpux/os_defines.h (__glibcpp_wchar_t_is_signed): Remove. - * config/os/bsd/freebsd/os_defines.h: + * config/os/bsd/freebsd/os_defines.h: (__glibcpp_long_double_bits): Remove. * config/os/aix/os_defines.h (__glibcpp_wchar_t_bits): Remove. (__glibcpp_wchar_t_is_signed): Remove. @@ -778,13 +885,13 @@ * config/cpu/arm/cpu_limits.h: Remove. * config/cpu/cris/cpu_limits.h: Remove. * config/cpu/generic/cpu_limits.h: Remove. - * config/cpu/generic/limits.h: Remove. + * config/cpu/generic/limits.h: Remove. * config/cpu/ia64/cpu_limits.h: Remove. - * config/cpu/m68k/cpu_limits.h: Remove. - * config/cpu/mmix/cpu_limits.h: Remove. - * config/cpu/powerpc/cpu_limits.h: Remove. + * config/cpu/m68k/cpu_limits.h: Remove. + * config/cpu/mmix/cpu_limits.h: Remove. + * config/cpu/powerpc/cpu_limits.h: Remove. * config/cpu/S390/cpu_limits.h: Remove. - + 2002-09-25 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de> * testsuite/18_support/numeric_limits.cc: Check the maximum and @@ -792,9 +899,9 @@ 2002-09-25 Mark Mitchell <mark@codesourcery.com> - * include/std/std_limits.h (numeric_limits<unsigned char>::digits): + * include/std/std_limits.h (numeric_limits<unsigned char>::digits): Fix typo. - + 2002-09-23 Richard Henderson <rth@redhat.com> * include/std/std_limits.h (__glibcpp_plain_char_is_signed, @@ -842,9 +949,9 @@ __glibcpp_s8_digits10 et al; check vs the installed versions of digits10 for particular sizes. - * include/std/std_limits.h (__glibcpp_float_is_modulo, - __glibcpp_double_is_modulo, __glibcpp_long_double_is_modulo): Kill. - (numeric_limits<T>::is_modulo, T floating): Use false. + * include/std/std_limits.h (__glibcpp_float_is_modulo, + __glibcpp_double_is_modulo, __glibcpp_long_double_is_modulo): Kill. + (numeric_limits<T>::is_modulo, T floating): Use false. 2002-09-22 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> @@ -994,16 +1101,16 @@ * libmath/Makefile.in: Regenerate. * src/Makefile.am: Tweak comment. * src/Makefile.in: Regenerate. - + * config/locale/gnu/c_locale.h: Remove warnings. Inject __uselocale into __gnu_cxx. * config/locale/generic/c_locale.h: Match. - + 2002-09-11 Benjamin Kosnik <bkoz@redhat.com> * include/bits/locale_facets.tcc (__convert_from_v): Remove. * config/locale/gnu/c_locale.h (__convert_from_v): Add. - * config/locale/generic/c_locale.h (__convert_from_v): Add. + * config/locale/generic/c_locale.h (__convert_from_v): Add. 2002-09-11 Paolo Carlini <pcarlini@unitus.it> @@ -1016,28 +1123,28 @@ (target_sources): New. (target_sources_extra): New. * src/Makefile.in: Regenerate. - * acinclude.m4: Set CCODECVT_CC. + * acinclude.m4: Set CCODECVT_CC. * aclocal.m4: Regenerate. * configure: Regenerate. * src/locale.cc: Move ctype definitions... - * src/ctype.cc: ...here. New file. + * src/ctype.cc: ...here. New file. * src/locale.cc: Move codecvt definitions... - * src/codecvt.cc: ...here. - * config/generic/codecvt_members.cc: ...and here. - * config/gnu/codecvt_members.cc: ...and here. + * src/codecvt.cc: ...here. + * config/generic/codecvt_members.cc: ...and here. + * config/gnu/codecvt_members.cc: ...and here. * include/bits/codecvt.h: Tweak. * include/bits/locale_facets: Tweak. * src/bitset.cc: Correct license text. * src/concept-inst.cc: Same. * src/strstream.cc: Same. - * src/vterminate.cc: Same. + * src/vterminate.cc: Same. 2002-09-10 Gabriel Dos Reis <gdr@soliton.integrable-solutions.net> * include/bits/stl_vector.h (vector<>): Don't use a name with different meanings before and after re-evaluation in the completed - scope. + scope. * include/bits/basic_string.h (basic_string<>): Likewise. * include/bits/stl_bvector.h (vector<bool>): Likewise. * include/bits/stl_deque.h (std): Likewise. @@ -1071,16 +1178,16 @@ * docs/html/configopts.html: Change grouping. Note ABI impacts. Update information for locale model defaults. * docs/html/install.html: Update include directory - information. - Update testing information. + information. + Update testing information. Update linux issues for named locales. * docs/html/abi.txt: Fix typos. Add more info. * src/misc-inst.cc: Add missing instantiations. - + * testsuite/abi_check.cc: Make output results more verbose. - + * config/os/gnu-linux/ctype_base.h: Remove shadow headers injections. 2002-09-07 Jakub Jelinek <jakub@redhat.com> @@ -1293,7 +1400,7 @@ __glibcpp_double_bits, __glibcpp_long_double_bits): Remove. Use compiler predifined macros. (__glibcpp_wchar_t_is_signed): Define based on compiler predefined - __WCHAR_UNSIGNED__. + __WCHAR_UNSIGNED__. 2002-08-27 Gabriel Dos Reis <gdr@integrable-solutions.net> @@ -1349,7 +1456,7 @@ (__glibcpp_long_double_infinity, __glibcpp_long_double_QNaN, __glibcpp_long_double_SNaN, __glibcpp_long_double_denorm_min): Likewise. - + * src/limits.cc (__glibcpp_float_infinity, __glibcpp_float_QNaN, __glibcpp_float_SNaN, __glibcpp_float_denorm_min): Define. (__glibcpp_double_infinity, __glibcpp_double_QNaN, @@ -1357,7 +1464,7 @@ (__glibcpp_long_double_infinity, __glibcpp_long_double_QNaN, __glibcpp_long_double_SNaN, __glibcpp_long_double_denorm_min): Likewise. - + 2002-08-25 Gabriel Dos Reis <gdr@integrable-solutions.net> * include/std/std_limits.h: Indent conditional macro definitions. @@ -1391,7 +1498,7 @@ * testsuite/Makefile.am (noinst_PROGRAMS): Make conditional on native compiling. * testsuite/Makefile.in: Regenerate. - + 2002-08-22 Loren J. Rittle <ljrittle@acm.org> * testsuite/abi_check.cc: Enhance shell portability. @@ -1409,7 +1516,7 @@ 2002-08-22 Benjamin Kosnik <bkoz@redhat.com> Phil Edwards <pme@gcc.gnu.org> Ulrich Drepper <drepper@redhat.com> - + * Makefile.am (check-abi): New rule. * Makefile.in: Regenerate. * acinclude.m4 (GLIBCPP_CONFIGURE_TESTSUITE): Export baseline_file. @@ -1417,17 +1524,17 @@ * configure: Regenerate. * testsuite/Makefile.am (noinst_PROGRAMS): Add abi_check. (abi_check_SOURCES): Add. - * testsuite/Makefile.in: Regenerate. + * testsuite/Makefile.in: Regenerate. * testsuite/abi_check.cc: New file. * config/abi: Add. * config/abi/i686-pc-linux-gnu: Add. * config/abi/i686-pc-linux-gnu/baseline_symbols.txt: New file. - + 2002-08-19 Benjamin Kosnik <bkoz@redhat.com> * configure.in (libtool_VERSION): Update to 5:1:0. * configure: Regenerate. - + 2002-08-19 Jonathan Wakely <jw@kayari.org> * docs/html/configopts.html, docs/html/documentation.html, @@ -1445,9 +1552,9 @@ Revert PR libstdc++/7445 * src/locale.cc (locale::classic): Revert. - + * docs/html/17_intro/TODO: Add. - + 2002-08-15 Phil Edwards <pme@gcc.gnu.org> * docs/html/documentation.html: Update doxygen links for 3.2. @@ -1483,11 +1590,11 @@ 2002-08-08 Danny Smith <dannysmith@users.sourceforge.net> Benjamin Kosnik <bkoz@redhat.com> - + * include/bits/istream.tcc (basic_istream::ignore): Use sbumpc, not snextc. * testsuite/27_io/narrow_stream_objects.cc (test10): Add. - + 2002-08-07 John David Anglin <dave@hiauly1.hia.nrc.ca> * libsupc++/Makefile.am (LTCOMPILE): Add LIBSUPCXX_PICFLAGS. @@ -1497,7 +1604,7 @@ PR/7491 * include/bits/slice_array.h(_DEFINE_VALARRAY_OPERATOR): - Instantiate with new function objects. + Instantiate with new function objects. * include/bits/mask_array.h (_DEFINE_VALARRAY_OPERATOR): Likewise. Reformat. Uglify. * include/bits/gslice_array.h: Likewise. @@ -1532,9 +1639,9 @@ * include/bits/valarray_meta.h (_UnFunBase<>): Remove. (_UnFunClos<>): Same. (_UnBase<>): Reformat. Make first template-parameter non - template. + template. (_UnClos<>): Likewise. - (_Expr<>): Reformate. Adjust unary member operator return types. + (_Expr<>): Reformate. Adjust unary member operator return types. (_DEFINE_EXPR_UNARY_OPERATOR): Adjust definition. (_DEFINE_EXPR_UNARY_FUNCTION): Likewise. * include/std/std_valarray.h (_UnClos<>): Adjust declaration. @@ -1555,9 +1662,9 @@ Revert PR libstdc++/6594 * src/strstream.cc (strstreambuf): Revert. (strstreambuf::overflow): Same. - (strstreambuf::~strstreambuf): Same. + (strstreambuf::~strstreambuf): Same. * testsuite/backward/strstream_members.cc (test02): Add. - + * docs/html/abi.txt: Update. Spell check. * testsuite/19_diagnostics/stdexceptions.cc (test04): Add bool test. @@ -1566,7 +1673,7 @@ * testsuite/Makefile.in: Regenerate. * testsuite/testsuite_hooks.h: Use __throw_exception_again, include functexcept.h so that -fno-exceptions will build. - + 2002-08-02 Gabriel Dos Reis <gdr@nerim.net> * include/bits/valarray_meta.h (__unary_plus, __negate, @@ -1575,7 +1682,7 @@ __shift_left, __shift_right, __logical_and, __logical_or, __logical_not, __equal_to, __not_equal_to, __less, __less_equal, __greater_equal, __greater, __atan2, __pow): New function object - classes. + classes. (__fun<>): New function traits class. 2002-08-01 Rick Danos <rdanos@hotmail.com> @@ -1588,10 +1695,10 @@ * libsupc++/Makefile.am (LT_COMPILE): Remove C++ flags. * libsupc++/Makefile.in: Regenerate. - + 2002-08-01 Benjamin Kosnik <bkoz@redhat.com> Jakub Jelinek <jakub@redhat.com> - + * config/linker-map.gnu: Change CXXABI_1 to CXXABI_1.2, GLIBCPP_3.1 to GLIBCPP_3.2. @@ -1606,7 +1713,7 @@ 2002-07-31 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/7442 - * libsupc++/cxxabi.h + * libsupc++/cxxabi.h (__base_class_info): Change to __base_class_type_info. 2.9.5p6c (__base_class_info::__base): Change to __base_type. 2.9.5p6c (__base_class_info::offset_shift): Change to __offset_shift. 2.9.5p6c @@ -1656,15 +1763,15 @@ (istream::sync): Same. (istream::sentry::sentry): Use eq_int_type. (istream::get): Same. - * include/bits/ostream.tcc: Change __pad to - __pad<_CharT, _Traits>::_S_pad. + * include/bits/ostream.tcc: Change __pad to + __pad<_CharT, _Traits>::_S_pad. * include/bits/locale_facets.h: Add __pad_traits generic and ostreambuf_iterator specialization. * include/bits/locale_facets.tcc: Change __pad into struct __pad with a _CharT and _Traits template parameter and _S_pad static member function. * src/locale-inst.cc: Update __pad instantiations. - + * include/std/std_fstream.h: Declare _M_underflow_common specializations. * src/fstream.cc: New. Add _M_underflow_common specializations. @@ -1686,12 +1793,12 @@ * testsuite/27_io/streambuf.cc: Add instantiation test, testsuite_hooks include. * testsuite/27_io/istream.cc: Same. - * testsuite/27_io/ostream.cc: Same. + * testsuite/27_io/ostream.cc: Same. * testsuite/27_io/fstream.cc: Same. * testsuite/27_io/stringstream.cc: Same. * testsuite/27_io/filebuf.cc: Same. * testsuite/27_io/stringbuf.cc: Same. - + 2002-07-29 Alan Modra <amodra@bigpond.net.au> * config/cpu/powerpc/cpu_limits.h (__glibcpp_long_bits): Define. @@ -1714,36 +1821,36 @@ * testsuite/27_io/ostream.cc: Same. * testsuite/27_io/filebuf.cc: Same. * testsuite/27_io/stringbuf.cc: Replace content, move to... - * testsuite/27_io/stringbuf_members.cc: ...here. + * testsuite/27_io/stringbuf_members.cc: ...here. * testsuite/27_io/streambuf.cc: Replace content, move to... - * testsuite/27_io/streambuf_members.cc: ...here. + * testsuite/27_io/streambuf_members.cc: ...here. * testsuite/27_io/stringstream.cc: Replace content, move to... * testsuite/27_io/stringstream_members.cc: ...here. * testsuite/27_io/ios.cc: New file. * testsuite/27_io/fstream.cc: New file. - * testsuite/27_io/ifstream.cc: New file. - * testsuite/27_io/ofstream.cc: New file. - * testsuite/27_io/istringstream.cc: New file. - * testsuite/27_io/ostringstream.cc: New file. - + * testsuite/27_io/ifstream.cc: New file. + * testsuite/27_io/ofstream.cc: New file. + * testsuite/27_io/istringstream.cc: New file. + * testsuite/27_io/ostringstream.cc: New file. + 2002-07-25 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/7220 * include/bits/istream.tcc (istream::ignore): Don't extract on zero. * testsuite/27_io/istream_unformatted.cc (test10): Add. - + 2002-07-25 Benjamin Kosnik <bkoz@redhat.com> * testsuite/27_io/ios_base_type.cc: Move to... * testsuite/27_io/ios_base_types.cc: ...here. - + 2002-07-24 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/7222 * src/locale.cc (locale::locale(const char*)): Use setlocale NULL. * testsuite/22_locale/ctor_copy_dtor.cc (test02): New. - + 2002-07-24 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/7230 @@ -1754,7 +1861,7 @@ * include/backward/strstream: Revert. * include/backward/strstream.h: Remove. * src/strstream.cc: Revert. - * testsuite/backward/strstream_members.cc: Change include. + * testsuite/backward/strstream_members.cc: Change include. 2002-07-24 Benjamin Kosnik <bkoz@redhat.com> @@ -1762,7 +1869,7 @@ * include/bits/ios_base.h (ios_base::streampos): Add. (ios_base::streamoff): Add. * testsuite/27_io/ios_base_type.cc: New. - + 2002-07-24 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/7286 @@ -1770,7 +1877,7 @@ * testsuite/18_support/new_delete_placement.cc: New. * docs/html/abi.txt: Fix typos. - + 2002-07-23 Benjamin Kosnik <bkoz@redhat.com> * docs/html/documentation.html: Remove libstdc++-v3.0.86 links, @@ -1778,10 +1885,10 @@ De-tangle contributor information from introductory notes. Move abi.txt link placement, activate. Re-organize. - Move chapter info into old FAQ format. + Move chapter info into old FAQ format. * docs/html/organization.html: Removed, obsoleted by doxygen work. * docs/html/abi.txt: Add notes on testing ABI changes. - + 2002-07-20 Phil Edwards <pme@gcc.gnu.org> * docs/html/abi.txt: New file. @@ -1803,15 +1910,15 @@ * bits/slice_array.h (_DEFINE_VALARRAY_OPERATOR): Fix typo of _Nname to _Name. - + 2002-07-19 Gabriel Dos Reis <gdr@nerim.net> DR/123 - * include/bits/slice_array.h + * include/bits/slice_array.h (slice_array<T>::operator=(const T&)): Constify. - * include/bits/gslice_array.h + * include/bits/gslice_array.h (gslice_array<T>::operator=(const T&)): Likewise. - * include/bits/mask_array.h + * include/bits/mask_array.h (mask_array<T>::operator=(const T&)): Likewise. * include/bits/indirect_array.h (indirect_array<T>::operator=(const T&): Likewise. diff --git a/libstdc++-v3/config/locale/generic/codecvt_members.cc b/libstdc++-v3/config/locale/generic/codecvt_members.cc index 814b8a2874d..e6a5749b7f4 100644 --- a/libstdc++-v3/config/locale/generic/codecvt_members.cc +++ b/libstdc++-v3/config/locale/generic/codecvt_members.cc @@ -48,7 +48,7 @@ namespace std extern_type*& __to_next) const { result __ret = error; - size_t __len = min(__from_end - __from, __to_end - __to); + size_t __len = std::min(__from_end - __from, __to_end - __to); size_t __conv = wcsrtombs(__to, &__from, __len, &__state); if (__conv == __len) @@ -77,7 +77,7 @@ namespace std intern_type*& __to_next) const { result __ret = error; - size_t __len = min(__from_end - __from, __to_end - __to); + size_t __len = std::min(__from_end - __from, __to_end - __to); size_t __conv = mbsrtowcs(__to, &__from, __len, &__state); if (__conv == __len) diff --git a/libstdc++-v3/config/locale/gnu/codecvt_members.cc b/libstdc++-v3/config/locale/gnu/codecvt_members.cc index aa855a6a1f2..5140dd200d0 100644 --- a/libstdc++-v3/config/locale/gnu/codecvt_members.cc +++ b/libstdc++-v3/config/locale/gnu/codecvt_members.cc @@ -48,7 +48,7 @@ namespace std extern_type*& __to_next) const { result __ret = error; - size_t __len = min(__from_end - __from, __to_end - __to); + size_t __len = std::min(__from_end - __from, __to_end - __to); #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) __c_locale __old = __uselocale(_M_c_locale_codecvt); #endif @@ -83,7 +83,7 @@ namespace std intern_type*& __to_next) const { result __ret = error; - size_t __len = min(__from_end - __from, __to_end - __to); + size_t __len = std::min(__from_end - __from, __to_end - __to); #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) __c_locale __old = __uselocale(_M_c_locale_codecvt); #endif diff --git a/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h b/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h index a7d56ae33af..2dee9d6390b 100644 --- a/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h +++ b/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h @@ -449,7 +449,7 @@ codecvt<_InternT, _ExternT, __enc_traits>:: do_length(const state_type&, const extern_type* __from, const extern_type* __end, size_t __max) const - { return min(__max, static_cast<size_t>(__end - __from)); } + { return std::min(__max, static_cast<size_t>(__end - __from)); } #ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS // 74. Garbled text for codecvt::do_max_length diff --git a/libstdc++-v3/docs/html/ext/sgiexts.html b/libstdc++-v3/docs/html/ext/sgiexts.html index 3f65aa340bb..e0ea0706bec 100644 --- a/libstdc++-v3/docs/html/ext/sgiexts.html +++ b/libstdc++-v3/docs/html/ext/sgiexts.html @@ -29,7 +29,7 @@ libstdc++-v3</a></h1> for a description). Not every chapter may have extensions, and the extensions may come and go. Also, this page is incomplete because the author is pressed for time. Check back often; the latest change was on - $Date: 2002/10/07 18:11:22 $ (UTC). + $Date: 2002/11/17 17:15:06 $ (UTC). </p> <p>Descriptions range from the scanty to the verbose. You should also check diff --git a/libstdc++-v3/include/bits/deque.tcc b/libstdc++-v3/include/bits/deque.tcc index a8d43d024c2..00ec7ad9512 100644 --- a/libstdc++-v3/include/bits/deque.tcc +++ b/libstdc++-v3/include/bits/deque.tcc @@ -282,7 +282,7 @@ namespace std _M_range_initialize(_ForwardIterator __first, _ForwardIterator __last, forward_iterator_tag) { - size_type __n = distance(__first, __last); + size_type __n = std::distance(__first, __last); _M_initialize_map(__n); _Map_pointer __cur_node; @@ -442,7 +442,7 @@ namespace std _ForwardIterator __first, _ForwardIterator __last, forward_iterator_tag) { - size_type __n = distance(__first, __last); + size_type __n = std::distance(__first, __last); if (__pos._M_cur == _M_start._M_cur) { iterator __new_start = _M_reserve_elements_at_front(__n); @@ -758,7 +758,7 @@ namespace std else { size_type __new_map_size = - _M_map_size + max(_M_map_size, __nodes_to_add) + 2; + _M_map_size + std::max(_M_map_size, __nodes_to_add) + 2; _Map_pointer __new_map = _M_allocate_map(__new_map_size); __new_nstart = __new_map + (__new_map_size - __new_num_nodes) / 2 diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc index 387f099ae98..e4bc382a74c 100644 --- a/libstdc++-v3/include/bits/fstream.tcc +++ b/libstdc++-v3/include/bits/fstream.tcc @@ -439,7 +439,7 @@ namespace std else { __ret = _M_file.seekoff(__off, ios_base::cur, __mode); - __ret += max(_M_out_cur, _M_in_cur) - _M_filepos; + __ret += std::max(_M_out_cur, _M_in_cur) - _M_filepos; } } _M_last_overflowed = false; diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc index a6e49a923bd..3c64fbd89e5 100644 --- a/libstdc++-v3/include/bits/istream.tcc +++ b/libstdc++-v3/include/bits/istream.tcc @@ -724,7 +724,7 @@ namespace std __streambuf_type* __sb = this->rdbuf(); int_type __c; - __n = min(__n, numeric_limits<streamsize>::max()); + __n = std::min(__n, numeric_limits<streamsize>::max()); while (_M_gcount < __n && !traits_type::eq_int_type(__c = __sb->sbumpc(), __eof)) { @@ -815,7 +815,7 @@ namespace std streamsize __num = this->rdbuf()->in_avail(); if (__num >= 0) { - __num = min(__num, __n); + __num = std::min(__num, __n); if (__num) _M_gcount = this->rdbuf()->sgetn(__s, __num); } diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index ce6f3d7d5ff..75def8f5a61 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -1628,8 +1628,8 @@ namespace std // Find smallest matching string. size_t __minlen = 10; for (size_t __i2 = 0; __i2 < __nmatches; ++__i2) - __minlen = min(__minlen, - __traits_type::length(__names[__matches[__i2]])); + __minlen = std::min(__minlen, + __traits_type::length(__names[__matches[__i2]])); if (__pos < __minlen && __beg != __end) { diff --git a/libstdc++-v3/include/bits/sstream.tcc b/libstdc++-v3/include/bits/sstream.tcc index 606705c02e9..b5848d858bd 100644 --- a/libstdc++-v3/include/bits/sstream.tcc +++ b/libstdc++-v3/include/bits/sstream.tcc @@ -91,7 +91,7 @@ namespace std { if (!__testeof) { - __size_type __len = max(_M_buf_size, _M_buf_size_opt); + __size_type __len = std::max(_M_buf_size, _M_buf_size_opt); __len *= 2; if (__testwrite) diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h index 009c409b6fb..719fb2714c7 100644 --- a/libstdc++-v3/include/bits/stl_algo.h +++ b/libstdc++-v3/include/bits/stl_algo.h @@ -1780,7 +1780,7 @@ __result, __binary_pred, _IterType()); __pred, __len - __len / 2); rotate(__begin, __middle, __end); - advance(__begin, distance(__middle, __end)); + advance(__begin, std::distance(__middle, __end)); return __begin; } @@ -1824,7 +1824,7 @@ __result, __binary_pred, _IterType()); __len - __len / 2, __buffer, __buffer_size); rotate(__begin, __middle, __end); - advance(__begin, distance(__middle, __end)); + advance(__begin, std::distance(__middle, __end)); return __begin; } } @@ -2271,7 +2271,7 @@ __result, __binary_pred, _IterType()); __first += __two_step; } - __step_size = min(_Distance(__last - __first), __step_size); + __step_size = std::min(_Distance(__last - __first), __step_size); merge(__first, __first + __step_size, __first + __step_size, __last, __result); } @@ -2292,7 +2292,7 @@ __result, __binary_pred, _IterType()); __comp); __first += __two_step; } - __step_size = min(_Distance(__last - __first), __step_size); + __step_size = std::min(_Distance(__last - __first), __step_size); merge(__first, __first + __step_size, __first + __step_size, __last, @@ -2781,7 +2781,7 @@ __result, __binary_pred, _IterType()); __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>) __glibcpp_function_requires(_LessThanComparableConcept<_Tp>) - _DistanceType __len = distance(__first, __last); + _DistanceType __len = std::distance(__first, __last); _DistanceType __half; _ForwardIter __middle; @@ -2825,7 +2825,7 @@ __result, __binary_pred, _IterType()); __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _Tp>) - _DistanceType __len = distance(__first, __last); + _DistanceType __len = std::distance(__first, __last); _DistanceType __half; _ForwardIter __middle; @@ -2866,7 +2866,7 @@ __result, __binary_pred, _IterType()); __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>) __glibcpp_function_requires(_LessThanComparableConcept<_Tp>) - _DistanceType __len = distance(__first, __last); + _DistanceType __len = std::distance(__first, __last); _DistanceType __half; _ForwardIter __middle; @@ -2910,7 +2910,7 @@ __result, __binary_pred, _IterType()); __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _Tp, _ValueType>) - _DistanceType __len = distance(__first, __last); + _DistanceType __len = std::distance(__first, __last); _DistanceType __half; _ForwardIter __middle; @@ -2958,7 +2958,7 @@ __result, __binary_pred, _IterType()); __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>) __glibcpp_function_requires(_LessThanComparableConcept<_Tp>) - _DistanceType __len = distance(__first, __last); + _DistanceType __len = std::distance(__first, __last); _DistanceType __half; _ForwardIter __middle, __left, __right; @@ -3013,7 +3013,7 @@ __result, __binary_pred, _IterType()); __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _Tp>) __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _Tp, _ValueType>) - _DistanceType __len = distance(__first, __last); + _DistanceType __len = std::distance(__first, __last); _DistanceType __half; _ForwardIter __middle, __left, __right; @@ -3223,17 +3223,17 @@ __result, __binary_pred, _IterType()); __len11 = __len1 / 2; advance(__first_cut, __len11); __second_cut = lower_bound(__middle, __last, *__first_cut); - __len22 = distance(__middle, __second_cut); + __len22 = std::distance(__middle, __second_cut); } else { __len22 = __len2 / 2; advance(__second_cut, __len22); __first_cut = upper_bound(__first, __middle, *__second_cut); - __len11 = distance(__first, __first_cut); + __len11 = std::distance(__first, __first_cut); } rotate(__first_cut, __middle, __second_cut); _BidirectionalIter __new_middle = __first_cut; - advance(__new_middle, distance(__middle, __second_cut)); + advance(__new_middle, std::distance(__middle, __second_cut)); __merge_without_buffer(__first, __first_cut, __new_middle, __len11, __len22); __merge_without_buffer(__new_middle, __second_cut, __last, @@ -3268,17 +3268,17 @@ __result, __binary_pred, _IterType()); __len11 = __len1 / 2; advance(__first_cut, __len11); __second_cut = lower_bound(__middle, __last, *__first_cut, __comp); - __len22 = distance(__middle, __second_cut); + __len22 = std::distance(__middle, __second_cut); } else { __len22 = __len2 / 2; advance(__second_cut, __len22); __first_cut = upper_bound(__first, __middle, *__second_cut, __comp); - __len11 = distance(__first, __first_cut); + __len11 = std::distance(__first, __first_cut); } rotate(__first_cut, __middle, __second_cut); _BidirectionalIter __new_middle = __first_cut; - advance(__new_middle, distance(__middle, __second_cut)); + advance(__new_middle, std::distance(__middle, __second_cut)); __merge_without_buffer(__first, __first_cut, __new_middle, __len11, __len22, __comp); __merge_without_buffer(__new_middle, __second_cut, __last, @@ -3313,7 +3313,7 @@ __result, __binary_pred, _IterType()); } else { rotate(__first, __middle, __last); - advance(__first, distance(__middle, __last)); + advance(__first, std::distance(__middle, __last)); return __first; } } @@ -3417,13 +3417,13 @@ __result, __binary_pred, _IterType()); __len11 = __len1 / 2; advance(__first_cut, __len11); __second_cut = lower_bound(__middle, __last, *__first_cut); - __len22 = distance(__middle, __second_cut); + __len22 = std::distance(__middle, __second_cut); } else { __len22 = __len2 / 2; advance(__second_cut, __len22); __first_cut = upper_bound(__first, __middle, *__second_cut); - __len11 = distance(__first, __first_cut); + __len11 = std::distance(__first, __first_cut); } _BidirectionalIter __new_middle = __rotate_adaptive(__first_cut, __middle, __second_cut, @@ -3469,13 +3469,13 @@ __result, __binary_pred, _IterType()); __len11 = __len1 / 2; advance(__first_cut, __len11); __second_cut = lower_bound(__middle, __last, *__first_cut, __comp); - __len22 = distance(__middle, __second_cut); + __len22 = std::distance(__middle, __second_cut); } else { __len22 = __len2 / 2; advance(__second_cut, __len22); __first_cut = upper_bound(__first, __middle, *__second_cut, __comp); - __len11 = distance(__first, __first_cut); + __len11 = std::distance(__first, __first_cut); } _BidirectionalIter __new_middle = __rotate_adaptive(__first_cut, __middle, __second_cut, @@ -3524,8 +3524,8 @@ __result, __binary_pred, _IterType()); if (__first == __middle || __middle == __last) return; - _DistanceType __len1 = distance(__first, __middle); - _DistanceType __len2 = distance(__middle, __last); + _DistanceType __len1 = std::distance(__first, __middle); + _DistanceType __len2 = std::distance(__middle, __last); _Temporary_buffer<_BidirectionalIter, _ValueType> __buf(__first, __last); if (__buf.begin() == 0) @@ -3577,8 +3577,8 @@ __result, __binary_pred, _IterType()); if (__first == __middle || __middle == __last) return; - _DistanceType __len1 = distance(__first, __middle); - _DistanceType __len2 = distance(__middle, __last); + _DistanceType __len1 = std::distance(__first, __middle); + _DistanceType __len2 = std::distance(__middle, __last); _Temporary_buffer<_BidirectionalIter, _ValueType> __buf(__first, __last); if (__buf.begin() == 0) @@ -4271,7 +4271,7 @@ __result, __binary_pred, _IterType()); return __last1; else { _BidirectionalIter1 __result = __rresult.base(); - advance(__result, -distance(__first2, __last2)); + advance(__result, -std::distance(__first2, __last2)); return __result; } } @@ -4301,7 +4301,7 @@ __result, __binary_pred, _IterType()); return __last1; else { _BidirectionalIter1 __result = __rresult.base(); - advance(__result, -distance(__first2, __last2)); + advance(__result, -std::distance(__first2, __last2)); return __result; } } diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index 6e488eae355..d19d1a012ea 100644 --- a/libstdc++-v3/include/bits/stl_algobase.h +++ b/libstdc++-v3/include/bits/stl_algobase.h @@ -790,7 +790,7 @@ namespace std { const size_t __len1 = __last1 - __first1; const size_t __len2 = __last2 - __first2; - const int __result = memcmp(__first1, __first2, min(__len1, __len2)); + const int __result = memcmp(__first1, __first2, std::min(__len1, __len2)); return __result != 0 ? __result < 0 : __len1 < __len2; } diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index 2c97d470582..da72b6460ab 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -410,7 +410,7 @@ template <typename _Alloc> template <class _ForwardIterator> void _M_initialize_range(_ForwardIterator __first, _ForwardIterator __last, forward_iterator_tag) { - size_type __n = distance(__first, __last); + size_type __n = std::distance(__first, __last); _M_initialize(__n); copy(__first, __last, _M_start); } @@ -430,14 +430,14 @@ template <typename _Alloc> _ForwardIterator __first, _ForwardIterator __last, forward_iterator_tag) { if (__first != __last) { - size_type __n = distance(__first, __last); + size_type __n = std::distance(__first, __last); if (capacity() - size() >= __n) { copy_backward(__position, end(), _M_finish + difference_type(__n)); copy(__first, __last, __position); _M_finish += difference_type(__n); } else { - size_type __len = size() + max(size(), __n); + size_type __len = size() + std::max(size(), __n); _Bit_type * __q = _M_bit_alloc(__len); iterator __i = copy(begin(), __position, iterator(__q, 0)); __i = copy(__first, __last, __i); @@ -592,7 +592,7 @@ template <typename _Alloc> template <class _ForwardIterator> void _M_assign_aux(_ForwardIterator __first, _ForwardIterator __last, forward_iterator_tag) { - size_type __len = distance(__first, __last); + size_type __len = std::distance(__first, __last); if (__len < size()) erase(copy(__first, __last, begin()), end()); else { @@ -677,7 +677,7 @@ template <typename _Alloc> _M_finish += difference_type(__n); } else { - size_type __len = size() + max(size(), __n); + size_type __len = size() + std::max(size(), __n); _Bit_type * __q = _M_bit_alloc(__len); iterator __i = copy(begin(), __position, iterator(__q, 0)); fill_n(__i, __n, __x); diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h index 454fed31bf7..a32212dd717 100644 --- a/libstdc++-v3/include/bits/stl_deque.h +++ b/libstdc++-v3/include/bits/stl_deque.h @@ -497,7 +497,7 @@ namespace std size_t __num_nodes = __num_elements / __deque_buf_size(sizeof(_Tp)) + 1; - _M_map_size = max((size_t) _S_initial_map_size, __num_nodes + 2); + _M_map_size = std::max((size_t) _S_initial_map_size, __num_nodes + 2); _M_map = _M_allocate_map(_M_map_size); // For "small" maps (needing less than _M_map_size nodes), allocation @@ -1355,7 +1355,7 @@ namespace std _M_assign_aux(_ForwardIterator __first, _ForwardIterator __last, forward_iterator_tag) { - size_type __len = distance(__first, __last); + size_type __len = std::distance(__first, __last); if (__len > size()) { _ForwardIterator __mid = __first; advance(__mid, size()); diff --git a/libstdc++-v3/include/bits/stl_list.h b/libstdc++-v3/include/bits/stl_list.h index fcba3598df2..a13bc1aaaf0 100644 --- a/libstdc++-v3/include/bits/stl_list.h +++ b/libstdc++-v3/include/bits/stl_list.h @@ -629,7 +629,7 @@ namespace std /** Returns the number of elements in the %list. */ size_type - size() const { return distance(begin(), end()); } + size() const { return std::distance(begin(), end()); } /** Returns the size() of the largest possible %list. */ size_type diff --git a/libstdc++-v3/include/bits/stl_tempbuf.h b/libstdc++-v3/include/bits/stl_tempbuf.h index 7b88f9333ec..000e64a661a 100644 --- a/libstdc++-v3/include/bits/stl_tempbuf.h +++ b/libstdc++-v3/include/bits/stl_tempbuf.h @@ -118,7 +118,7 @@ public: _Trivial; try { - _M_len = distance(__first, __last); + _M_len = std::distance(__first, __last); _M_allocate_buffer(); if (_M_len > 0) _M_initialize_buffer(*__first, _Trivial()); diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h index 1e7fdf5db2d..42fd0b61b4d 100644 --- a/libstdc++-v3/include/bits/stl_tree.h +++ b/libstdc++-v3/include/bits/stl_tree.h @@ -1181,7 +1181,7 @@ namespace std _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::erase(const _Key& __x) { pair<iterator,iterator> __p = equal_range(__x); - size_type __n = distance(__p.first, __p.second); + size_type __n = std::distance(__p.first, __p.second); erase(__p.first, __p.second); return __n; } @@ -1306,7 +1306,7 @@ namespace std count(const _Key& __k) const { pair<const_iterator, const_iterator> __p = equal_range(__k); - size_type __n = distance(__p.first, __p.second); + size_type __n = std::distance(__p.first, __p.second); return __n; } diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h index 53547322d65..83ed3c5f683 100644 --- a/libstdc++-v3/include/bits/stl_vector.h +++ b/libstdc++-v3/include/bits/stl_vector.h @@ -823,7 +823,7 @@ namespace std _M_range_initialize(_ForwardIterator __first, _ForwardIterator __last, forward_iterator_tag) { - size_type __n = distance(__first, __last); + size_type __n = std::distance(__first, __last); _M_start = _M_allocate(__n); _M_end_of_storage = _M_start + __n; _M_finish = uninitialized_copy(__first, __last, _M_start); diff --git a/libstdc++-v3/include/bits/streambuf.tcc b/libstdc++-v3/include/bits/streambuf.tcc index 5f57df583a7..73db2cdebfd 100644 --- a/libstdc++-v3/include/bits/streambuf.tcc +++ b/libstdc++-v3/include/bits/streambuf.tcc @@ -128,7 +128,7 @@ namespace std if (__buf_len > 0) { size_t __remaining = __n - __ret; - size_t __len = min(__buf_len, __remaining); + size_t __len = std::min(__buf_len, __remaining); traits_type::copy(__s, _M_in_cur, __len); __ret += __len; __s += __len; @@ -167,7 +167,7 @@ namespace std if (__buf_len > 0) { off_type __remaining = __n - __ret; - off_type __len = min(__buf_len, __remaining); + off_type __len = std::min(__buf_len, __remaining); traits_type::copy(_M_out_cur, __s, __len); __ret += __len; __s += __len; diff --git a/libstdc++-v3/include/bits/vector.tcc b/libstdc++-v3/include/bits/vector.tcc index da5cf7edf83..4b22af0af15 100644 --- a/libstdc++-v3/include/bits/vector.tcc +++ b/libstdc++-v3/include/bits/vector.tcc @@ -191,7 +191,7 @@ namespace std _M_assign_aux(_ForwardIter __first, _ForwardIter __last, forward_iterator_tag) { - size_type __len = distance(__first, __last); + size_type __len = std::distance(__first, __last); if (__len > capacity()) { @@ -333,7 +333,7 @@ namespace std else { const size_type __old_size = size(); - const size_type __len = __old_size + max(__old_size, __n); + const size_type __len = __old_size + std::max(__old_size, __n); iterator __new_start(_M_allocate(__len)); iterator __new_finish(__new_start); try @@ -381,7 +381,7 @@ namespace std { if (__first != __last) { - size_type __n = distance(__first, __last); + size_type __n = std::distance(__first, __last); if (size_type(_M_end_of_storage - _M_finish) >= __n) { const size_type __elems_after = end() - __position; @@ -407,7 +407,7 @@ namespace std else { const size_type __old_size = size(); - const size_type __len = __old_size + max(__old_size, __n); + const size_type __len = __old_size + std::max(__old_size, __n); iterator __new_start(_M_allocate(__len)); iterator __new_finish(__new_start); try diff --git a/libstdc++-v3/include/std/std_bitset.h b/libstdc++-v3/include/std/std_bitset.h index e938662b4ee..f2fde3111d1 100644 --- a/libstdc++-v3/include/std/std_bitset.h +++ b/libstdc++-v3/include/std/std_bitset.h @@ -1096,7 +1096,7 @@ namespace std bitset<_Nb>::_M_copy_from_string(const basic_string<_CharT,_Traits,_Alloc>& __s, size_t __pos, size_t __n) { reset(); - const size_t __nbits = min(_Nb, min(__n, __s.size() - __pos)); + const size_t __nbits = std::min(_Nb, std::min(__n, __s.size() - __pos)); for (size_t __i = 0; __i < __nbits; ++__i) { switch(__s[__pos + __nbits - __i - 1]) diff --git a/libstdc++-v3/include/std/std_complex.h b/libstdc++-v3/include/std/std_complex.h index f297296386b..955a12ca249 100644 --- a/libstdc++-v3/include/std/std_complex.h +++ b/libstdc++-v3/include/std/std_complex.h @@ -411,7 +411,7 @@ namespace std { _Tp __x = __z.real(); _Tp __y = __z.imag(); - const _Tp __s = max(abs(__x), abs(__y)); + const _Tp __s = std::max(abs(__x), abs(__y)); if (__s == _Tp()) // well ... return __s; __x /= __s; diff --git a/libstdc++-v3/include/std/std_sstream.h b/libstdc++-v3/include/std/std_sstream.h index aaec83f082b..936481d6e05 100644 --- a/libstdc++-v3/include/std/std_sstream.h +++ b/libstdc++-v3/include/std/std_sstream.h @@ -141,7 +141,7 @@ namespace std // current stringbuf internal buffer. __size_type __len = _M_string.size(); if (_M_out_cur > _M_out_beg) - __len = max(__size_type(_M_out_end - _M_out_beg), __len); + __len = std::max(__size_type(_M_out_end - _M_out_beg), __len); return __string_type(_M_out_beg, _M_out_beg + __len); } else diff --git a/libstdc++-v3/include/std/std_streambuf.h b/libstdc++-v3/include/std/std_streambuf.h index 883401bf6ee..ffa14dff52a 100644 --- a/libstdc++-v3/include/std/std_streambuf.h +++ b/libstdc++-v3/include/std/std_streambuf.h @@ -265,7 +265,7 @@ namespace std if (!_M_pback_init) { size_t __dist = _M_in_end - _M_in_cur; - size_t __len = min(_S_pback_size, __dist); + size_t __len = std::min(_S_pback_size, __dist); traits_type::copy(_M_pback, _M_in_cur, __len); _M_pback_cur_save = _M_in_cur; _M_pback_end_save = _M_in_end; diff --git a/libstdc++-v3/libsupc++/eh_globals.cc b/libstdc++-v3/libsupc++/eh_globals.cc index 3033619b12a..04941c613f5 100644 --- a/libstdc++-v3/libsupc++/eh_globals.cc +++ b/libstdc++-v3/libsupc++/eh_globals.cc @@ -47,7 +47,6 @@ static int use_thread_key = -1; static void get_globals_dtor (void *ptr) { - __gthread_key_dtor (globals_key, ptr); if (ptr) std::free (ptr); } diff --git a/libstdc++-v3/src/codecvt.cc b/libstdc++-v3/src/codecvt.cc index b9575cf70bc..e86d15b9397 100644 --- a/libstdc++-v3/src/codecvt.cc +++ b/libstdc++-v3/src/codecvt.cc @@ -64,7 +64,7 @@ namespace std extern_type* __to, extern_type* __to_end, extern_type*& __to_next) const { - size_t __len = min(__from_end - __from, __to_end - __to); + size_t __len = std::min(__from_end - __from, __to_end - __to); memcpy(__to, __from, __len); __from_next = __from; __to_next = __to; @@ -87,7 +87,7 @@ namespace std intern_type* __to, intern_type* __to_end, intern_type*& __to_next) const { - size_t __len = min(__from_end - __from, __to_end - __to); + size_t __len = std::min(__from_end - __from, __to_end - __to); memcpy(__to, __from, __len); __from_next = __from; __to_next = __to; @@ -108,7 +108,7 @@ namespace std codecvt<char, char, mbstate_t>:: do_length (const state_type&, const extern_type* __from, const extern_type* __end, size_t __max) const - { return min(__max, static_cast<size_t>(__end - __from)); } + { return std::min(__max, static_cast<size_t>(__end - __from)); } int codecvt<char, char, mbstate_t>:: @@ -154,7 +154,7 @@ namespace std codecvt<wchar_t, char, mbstate_t>:: do_length(const state_type&, const extern_type* __from, const extern_type* __end, size_t __max) const - { return min(__max, static_cast<size_t>(__end - __from)); } + { return std::min(__max, static_cast<size_t>(__end - __from)); } int codecvt<wchar_t, char, mbstate_t>:: diff --git a/libstdc++-v3/src/strstream.cc b/libstdc++-v3/src/strstream.cc index 4d585659b9b..f0c1000e6d4 100644 --- a/libstdc++-v3/src/strstream.cc +++ b/libstdc++-v3/src/strstream.cc @@ -59,7 +59,7 @@ namespace std : _Base(), _M_alloc_fun(0), _M_free_fun(0), _M_dynamic(true), _M_frozen(false), _M_constant(false) { - streamsize n = max(initial_capacity, streamsize(16)); + streamsize n = std::max(initial_capacity, streamsize(16)); char* buf = _M_alloc(n); if (buf) @@ -148,7 +148,7 @@ namespace std if (pptr() == epptr() && _M_dynamic && !_M_frozen && !_M_constant) { ptrdiff_t old_size = epptr() - pbase(); - ptrdiff_t new_size = max(2 * old_size, ptrdiff_t(1)); + ptrdiff_t new_size = std::max(2 * old_size, ptrdiff_t(1)); char* buf = _M_alloc(new_size); if (buf) @@ -168,7 +168,7 @@ namespace std if (reposition_get) setg(buf, buf + old_get_offset, buf + - max(old_get_offset, old_size)); + std::max(old_get_offset, old_size)); _M_free(old_buffer); } |