Merge from mainline r109338

git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gomp-20050608-branch@109349 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 290 insertions, 0 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fcc77fca12f..5c7a8060dac 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,293 @@
+2006-01-04  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/ext/sso_string_base.h (__sso_string_base<>::_M_dataplus):
+	Use _CharT_alloc_type as base class.
+	(_M_get_allocator, _M_swap, _M_create, _M_destroy): Adjust.
+	* include/ext/vstring.h (get_allocator): Tidy.
+
+2006-01-04  Paolo Carlini  <pcarlini@suse.de>
+
+	Implement Option 3 of DR 431 for all the containers.
+	* include/bits/allocator.h (struct __alloc_swap): Add, swaps
+	allocators, optimized to nothing in case they are empty.
+	* include/bits/stl_deque.h (deque<>::swap): Use it.
+	* include/bits/stl_list.h (list<>::swap): Likewise.
+	* include/bits/stl_tree.h (_Rb_tree<>::swap): Likewise.
+	* include/bits/stl_vector.h (vector<>::swap): Likewise.
+	* include/tr1/hashtable (hashtable<>::swap): Likewise.
+	* include/ext/rc_string_base.h (__rc_string_base<>::_M_swap):
+	Likewise.
+	* include/ext/sso_string_base.h (__sso_string_base<>::_M_swap):
+	Likewise.
+	* include/ext/vstring_util.h (__vstring_utility<>::_Alloc_hider):
+	Clean-up (now vstring uses the generic __alloc_swap facility).
+	* include/tr1/unordered_map: Adjust includes.
+	* include/tr1/unordered_set: Likewise.
+	* docs/html/ext/howto.html: Add an entry for DR 431.
+	* testsuite/23_containers/deque/modifiers/swap.cc: Move to...
+	* testsuite/23_containers/deque/modifiers/swap/1.cc: ... here.		
+	* testsuite/23_containers/deque/modifiers/swap/2.cc: New.
+	* testsuite/23_containers/deque/modifiers/swap/3.cc: New.
+	* testsuite/23_containers/list/modifiers/swap.cc: Move to...
+	* testsuite/23_containers/list/modifiers/swap/1.cc: ... here.		
+	* testsuite/23_containers/list/modifiers/swap/2.cc: New.
+	* testsuite/23_containers/list/modifiers/swap/3.cc: New.
+	* testsuite/23_containers/vector/modifiers/swap.cc: Move to...
+	* testsuite/23_containers/vector/modifiers/swap/1.cc: ... here.		
+	* testsuite/23_containers/vector/modifiers/swap/2.cc: New.
+	* testsuite/23_containers/vector/modifiers/swap/3.cc: New.
+	* testsuite/23_containers/set/modifiers/swap.cc: Move to...
+	* testsuite/23_containers/set/modifiers/swap/1.cc: ... here.		
+	* testsuite/23_containers/set/modifiers/swap/2.cc: New.
+	* testsuite/23_containers/set/modifiers/swap/3.cc: New.
+	* testsuite/23_containers/map/modifiers/swap.cc: Move to...
+	* testsuite/23_containers/map/modifiers/swap/1.cc: ... here.		
+	* testsuite/23_containers/map/modifiers/swap/2.cc: New.
+	* testsuite/23_containers/map/modifiers/swap/3.cc: New.
+	* testsuite/23_containers/multiset/modifiers/swap.cc: Move to...
+	* testsuite/23_containers/multiset/modifiers/swap/1.cc: ... here.		
+	* testsuite/23_containers/multiset/modifiers/swap/2.cc: New.
+	* testsuite/23_containers/multiset/modifiers/swap/3.cc: New.
+	* testsuite/23_containers/multimap/modifiers/swap.cc: Move to...
+	* testsuite/23_containers/multimap/modifiers/swap/1.cc: ... here.		
+	* testsuite/23_containers/multimap/modifiers/swap/2.cc: New.
+	* testsuite/23_containers/multimap/modifiers/swap/3.cc: New.
+	* testsuite/tr1/6_containers/unordered/swap/unordered_set/1.cc: New.	
+	* testsuite/tr1/6_containers/unordered/swap/unordered_set/2.cc: New.
+	* testsuite/tr1/6_containers/unordered/swap/unordered_map/1.cc: New.	
+	* testsuite/tr1/6_containers/unordered/swap/unordered_map/2.cc: New.
+	* testsuite/tr1/6_containers/unordered/swap/unordered_multiset/1.cc: New.	
+	* testsuite/tr1/6_containers/unordered/swap/unordered_multiset/2.cc: New.
+	* testsuite/tr1/6_containers/unordered/swap/unordered_multimap/1.cc: New.	
+	* testsuite/tr1/6_containers/unordered/swap/unordered_multimap/2.cc: New.
+
+2006-01-03  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/bits/stl_list.h (_List_base<>::_M_get_Node_allocator): Add.
+	(_M_get_Tp_allocator, get_allocator): Tidy.
+	(list<>::list(const list&), insert(iterator, size_type, const
+	value_type&), insert(iterator, _InputIterator, _InputIterator)):
+	Use _M_get_Node_allocator.
+	* include/bits/stl_tree.h (_Rb_tree<>::_M_get_Node_allocator()): Add.
+	(_Rb_tree(const _Rb_tree<>&): Use it.
+	* include/bits/stl_deque.h (_Deque_base<>::_M_get_map_allocator,
+	get_allocator): Tidy.
+	* include/bits/stl_vector.h (_Vector_base<>::get_allocator): Tidy.
+	* testsuite/23_containers/map/operators/1_neg.cc: Adjust dg-error
+	line numbers.
+	* testsuite/23_containers/set/operators/1_neg.cc: Likewise.
+	
+	* testsuite/testsuite_allocator.h (uneq_allocator<>::swap): Fix.
+
+	* testsuite/testsuite_allocator.h (class uneq_allocator): A simple
+	non-empty testing allocator which can be endowed of a "personality"
+	at construction time.
+
+2006-01-03  Paolo Carlini  <pcarlini@suse.de>
+
+	* testsuite/27_io/basic_stringstream/str/char/1.cc: Initialize vars.
+	* testsuite/27_io/basic_stringstream/str/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_istringstream/str/char/1.cc: Likewise, tidy.
+	* testsuite/27_io/basic_istringstream/str/wchar_t/1.cc: Likewise.
+
+2006-01-02  Mark Mitchell  <mark@codesourcery.com>
+
+	* src/Makefile.am (LTLDFLAGS): New variable. 
+	(CXXLINK): Use LTLDFLAGS.
+	* src/Makefile.in: Regenerated.
+	* libsupc++/Makefile.am (LTLDFLAGS): New variable. 
+	(CXXLINK): Use LTLDFLAGS.
+	* libsupc++/Makefile.in: Regenerated.
+
+2006-01-02  Paolo Carlini  <pcarlini@suse.de>
+
+	PR libstdc++/24645
+	* include/std/std_istream.h (basic_istream<>::_M_extract): New.
+	(operator>>(bool&), operator>>(short&), operator>>(unsigned short&),
+	operator>>(int&), operator>>(unsigned int&), operator>>(long&),
+	operator>>(unsigned long&), operator>>(long long&), operator>>
+	(unsigned long long&), operator>>(float&), operator>>(double&),
+	operator>>(long double&), operator>>(void*&)): Use it.
+	* include/bits/istream.tcc (basic_istream<>::_M_extract): Define.
+	* include/std/std_ostream.h (basic_ostream<>::_M_insert): New.
+	(operator<<(long), operator<<(unsigned long), operator<<(bool),
+	operator<<(short), operator<<(unsigned short), operator<<(int),
+	operator<<(unsigned int), operator<<(long long), operator<<
+	(unsigned long long), operator<<(double), operator<<(float),
+	operator<<(long double), operator<<(const void*): Use it.
+	* include/bits/ostream.tcc (basic_ostream<>::_M_insert): Define.
+	* src/istream-inst.cc: Add _M_extract instantiations.
+	* src/ostream-inst.cc: Add _M_insert instantiations.
+	* config/abi/pre/gnu.ver: Export the new symbols @GLIBCXX_3.4.7;
+	detail existing @GLIBCXX_3.4 exports of basic_ostream, num_put,
+	money_put, etc., symbols to avoid exporting _M_insert symbols
+	@GLIBCXX_3.4.
+
+2005-12-28  Paolo Carlini  <pcarlini@suse.de>
+
+	* docs/html/ext/lwg-active.html, lwg-defects.html: Import Revision 40.
+
+2005-12-28  Chris Jefferson  <chris@bubblescope.net>
+
+	* testsuite/testsuite_allocator.h (check_deallocate_null): Return true.
+
+2005-12-28  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/std/std_bitset.h (bitset<>::_M_copy_from_string,
+	bitset<>::_M_copy_to_string, bitset<>::operator>>): Reverse loop.
+
+	* testsuite/25_algorithms/heap/heap.cc (test01): Always enable
+	complexity checks.
+	* testsuite/18_support/numeric_limits/specialization.cc: Avoid
+	unused parameter warning.
+	* testsuite/18_support/numeric_limits/traps.cc: Acoid unused variable
+	warning.
+	* testsuite/ext/malloc_allocator/deallocate_global.cc: Fix format
+	string.
+	* testsuite/ext/malloc_allocator/deallocate_local.cc: Likewise.
+	* testsuite/ext/array_allocator/2.cc: Remove unused variable.
+	* testsuite/tr1/3_function_objects/mem_fn.cc: Avoid unused variable
+	warnings.
+	* testsuite/tr1/6_containers/unordered/instantiate/set.cc: Just
+	instantiate.
+	* testsuite/tr1/6_containers/unordered/instantiate/map.cc: Likewise.
+	* testsuite/tr1/6_containers/unordered/instantiate/hash.cc: Likewise.
+	* testsuite/tr1/6_containers/unordered/instantiate/multiset.cc:
+	Likewise.
+	* testsuite/tr1/6_containers/unordered/instantiate/multimap.cc:
+	Likewise.
+	* testsuite/tr1/6_containers/array/cons/aggregate_initialization.cc:
+	Avoid unused variable warnings.
+	* testsuite/tr1/6_containers/array/requirements/zero_sized_arrays.cc:
+	Likewise.
+	* testsuite/thread/18185.cc: Likewise.
+	* testsuite/27_io/ios_base/storage/11584.cc: Likewise; avoid comparison
+	between signed and unsigned warning.
+	* testsuite/27_io/types/1.cc: Avoid unused variable warnings.
+	* testsuite/testsuite_allocator.h (check_new): Likewise.
+	(check_deallocate_null): Adjust return type.
+	* testsuite/testsuite_hooks.h (bitmask_operators): Avoid unused
+	variable warnings.
+	* testsuite/21_strings/c_strings/wchar_t/24559.cc: Avoid unused
+	variable warning.
+
+2005-12-28  Chris Jefferson  <chris@bubblescope.net>
+
+	* include/std/std_bitset.h (bitset<0>::set, bitset<0>::reset,
+	bitset<0>::flip, bitset<0>::test): Add inline specializations for
+	bitset<0>.
+
+	* testsuite/tr1/6_containers/unordered/insert/multiset_range.cc
+	(test01): Add static cast.
+	* testsuite/tr1/6_containers/unordered/insert/set_range.cc
+	(test01): Likewise.
+	* testsuite/testsuite_hooks.h (operator==(NonDefaultConstructible,
+	NonDefaultConstructible), operator<(NonDefaultConstructible,
+	NonDefaultConstrictible)): Avoid unused parameter warning.
+
+2005-12-26  Chris Jefferson  <chris@bubblescope.net>
+
+	* include/ext/mt_allocator.h (__mt_alloc::__mt_alloc): Remove
+	name of unused parameter.
+	* include/bits/stream_iterator.h (istream_iterator::istream_iterator):
+	Construct _M_value.
+	* include/debug/functions.h (__check_valid_range): Add
+	__attribute__((unused)).
+	* include/tr1/hashtable (hashtable::end): Remove name of unused
+	parameter.
+	* include/tr1/tuple_iterate.h (tuple::tuple): Likewise.
+	(tuple::operator=): Add __attribute__((unused)).
+	* include/tr1/functional (Fnv_hash<4>::hash): Add static_cast.
+	(Fnv_hash<8>::hash): Likewise.
+
+	* testsuite/25_algorithms/iter_swap/20577.cc (swap): Remove name of
+	unused parameter.
+	* testsuite/25_algorithms/unique_copy/check_type.cc (S2::S2,X2::X2):
+	Likewise.
+	* testsuite/22_locale/ctype/narrow/char/19955.cc (do_narrow): Likewise.
+	* testsuite/22_locale/ctype/is/char/9858.cc (Derived::do_is, 
+	Derived::do_scan_is, Derived::do_scan_not, Derived2::do_is,
+	Derived2::do_scan_is, Derived2::do_scan_not): Likewise.
+	* testsuite/22_locale/time_put/put/wchar_t/12439_1.cc (TP::do_put):
+	Likewise.
+	* testsuite/22_locale/time_put/put/wchar_t/12439_3.cc (TP::do_put):
+	Likewise.
+	* testsuite/22_locale/time_put/put/char/12439_1.cc (TP::do_put):
+	Likewise.
+	* testsuite/22_locale/time_put/put/char/12439_3.cc (TP::do_put):
+	Likewise.
+	* testsuite/testsuite_io.h (fail_num_get::do_get, fail_num_put::do_put):
+	Likewise.
+	* testsuite/25_algorithms/find/17441.cc (find): Likewise.
+	* testsuite/23_containers/vector/cons/clear_allocator.cc
+	(clear_alloc::clear_alloc): Likewise.
+	* testsuite/23_containers/vector/bool/clear_allocator.cc
+	(clear_alloc::clear_alloc): Likewise.
+	* testsuite/23_containers/list/cons/clear_allocator.cc
+	(clear_alloc::clear_alloc): Likewise.
+	* testsuite/23_containers/set/modifiers/16728.cc (test_container):
+	Likewise.
+	* testsuite/27_io/basic_ios/cons/char/3.cc (char_traits::to_char_type,
+	to_int_type): Likewise.
+	* testsuite/27_io/basic_filebuf/imbue/12206.cc (codecvt::do_out, do_in,
+	do_unshift, do_length): Likewise.
+	* testsuite/21_strings/basic_string/capacity/1.cc 
+	(operator==(A<T>,A<T>), operator<(A<T>,A<T>),
+	char_traits::to_char_type, char_traits::to_int_type): Likewise
+	* testsuite/testsuite_character.h (ctype::do_is, ctype::do_scan_is,
+	ctype::do_scan_not, do_toupper, do_tolower): Likewise.
+	* testsuite/25_algorithms/replace_copy/check_type.cc (Z::operator=):
+	Add missing return statement.
+	* testsuite/25_algorithms/replace_copy_if/check_type.cc (Z::operator=):
+	Likewise.
+	* testsuite/testsuite_iterators.h (output_iterator_wrapper::operator=,
+	random_access_iterator_wrapper::operator==): Likewise.
+	* testsuite/20_util/functional/binders/1.cc (s::f_int_int_const,
+	s::f_int_int, s::f_int_void_const, s::f_int_void): Likewise.
+	* testsuite/27_io/types/1.cc (test01): Likewise.
+	* testsuite/27_io/basic_ostream/write/wchar_t/1.cc (test01): Likewise.
+	* testsuite/27_io/basic_ostream/write/char/1.cc (test01): Likewise.
+	* testsuite/21_strings/c_strings/wchar_t/24559.cc (main): Likewise.
+	* testsuite/27_io/basic_istream/ignore/wchar_t/2.cc (check): Add static
+	cast.
+	* testsuite/27_io/basic_istream/ignore/char/2.cc (check): Likewise.
+	* testsuite/27_io/basic_istream/getline/wchar_t/5.cc (check): Likewise.
+	* testsuite/27_io/basic_istream/getline/char/5.cc (check): Likewise.
+	* testsuite/testsuite_allocator.h (check_new): Likewise.
+	(check_deallocate_null): Add missing return value.
+	* testsuite/ext/pool_allocator/allocate_chunk.cc (test01):
+	Make variable unsigned.
+	* testsuite/23_containers/vector/modifiers/erase/1.cc (N,N1,N2,N3,N4,
+	N5,test01): Likewise.
+	* testsuite/26_numerics/valarray/valarray_subset_assignment.cc
+	(check_array): Likewise.
+	(main): Removed unused variable.
+	* testsuite/27_io/basic_streambuf/in_avail/wchar_t/1.cc (test05):
+	Removed unused variable.
+	* testsuite/27_io/basic_ostream/flush/wchar_t/1.cc (test01): Likewise.
+	* testsuite/27_io/basic_ostream/flush/char/1.cc (test01): Likewise.
+	* testsuite/27_io/basic_ostream/endl/wchar_t/1.cc (test01): Likewise.
+	* testsuite/27_io/basic_ostream/endl/char/1.cc (test01): Likewise.
+	* testsuite/27_io/basic_ostream/ends/wchar_t/1.cc (test01): Likewise.
+	* testsuite/27_io/basic_ostream/ends/char/1.cc (test01): Likewise.
+	* testsuite/tr1/2_general_utilities/memory/shared_ptr/
+	assign/shared_ptr.cc (test01): Correct return type.	
+	* testsuite/27_io/basic_filebuf/close/char/2.cc (test_02):
+	Add default value to close_num.
+
+2005-12-24  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/bits/stl_algobase.h (fill(const _Deque_iterator&,
+	const _Deque_iterator&, const _Tp&)): Deal, correctly, only
+	with iterators (leave const_iterators alone).
+
+2005-12-24  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/bits/stl_algobase.h (fill(const _Deque_iterator<>&,
+	const _Deque_iterator<>&, const _Tp&)): Add.
+
+	* testsuite/23_containers/deque/cons/assign/1.cc: New.
+
 2005-12-19  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/bits/stl_deque.h (deque<>::resize, _M_fill_assign):