unordered_map.h (__unordered_map): Remove.

2012-04-12  Benjamin Kosnik  <bkoz@redhat.com>

	* include/bits/unordered_map.h (__unordered_map): Remove.
	(__unordered_multimap): Remove.
	Add aliases for __umap_traits, __umap_hashtable, __ummap_traits,
	__ummap_hashtable.
	(unordered_map): Derive from __umap_hashtable.
	(unordered_multimap): Derive from __ummap_hashtable.
	* include/bits/unordered_set.h (__unordered_set): Remove.
	(__unordered_multiset): Remove.
	Add aliases for __uset_traits, __uset_hashtable, __umset_traits,
	__umset_hashtable.
	(unordered_set): Derive from __uset_hashtable.
	(unordered_multiset): Derive from __umset_hashtable.
	* include/bits/hashtable.h (__cache_default): New, consolidated
	cache defaults for _Hashtable. Adjust comments for doxygen.
	(_Hashtable): Consolidate bool template parameters into new,
	_Traits class. Inherited base classes synthesize _Hashtable in
	CRTP via original 10 parameters. Prefer using declarations to
	typedefs, add __node_type, __bucket_type, etc. Push many nested
	types down hierarchy to _Hashtable_base. Add constructors
	necessary for top-level unordered_containers. Consolidate insert
	member functions and logic in new base class, __detail::_Insert
	and __detail::_Insert_base.
	(_Hashtable::operator=(initializer_list)): Add.
	* include/bits/hashtable_policy.h: Convert to doxygen markup.
	(_Hashtable_traits) New. Consolidate bool template parameters here.
	(_Insert, _Insert_base): New, consolidated insert member functions.
	(_Map_base, _Equality, _Rehash_base): Adjust template parameters,
	use base types.
	(_Hashtable_base): Move type declarations useful to other base
	classes into this class.
	* python/libstdcxx/v6/printers.py (Tr1HashtableIterator): Update.
	* testsuite/23_containers/unordered_set/instantiation_neg.cc:
	Adjust traits, line numbers.

From-SVN: r186403

libstdc++-v3/ChangeLog

+2012-04-12  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* include/bits/unordered_map.h (__unordered_map): Remove.
+	(__unordered_multimap): Remove.
+	Add aliases for __umap_traits, __umap_hashtable, __ummap_traits,
+	__ummap_hashtable.
+	(unordered_map): Derive from __umap_hashtable.
+	(unordered_multimap): Derive from __ummap_hashtable.
+	* include/bits/unordered_set.h (__unordered_set): Remove.
+	(__unordered_multiset): Remove.
+	Add aliases for __uset_traits, __uset_hashtable, __umset_traits,
+	__umset_hashtable.
+	(unordered_set): Derive from __uset_hashtable.
+	(unordered_multiset): Derive from __umset_hashtable.
+	* include/bits/hashtable.h (__cache_default): New, consolidated
+	cache defaults for _Hashtable. Adjust comments for doxygen.
+	(_Hashtable): Consolidate bool template parameters into new,
+	_Traits class. Inherited base classes synthesize _Hashtable in
+	CRTP via original 10 parameters. Prefer using declarations to
+	typedefs, add __node_type, __bucket_type, etc. Push many nested
+	types down hierarchy to _Hashtable_base. Add constructors
+	necessary for top-level unordered_containers. Consolidate insert
+	member functions and logic in new base class, __detail::_Insert
+	and __detail::_Insert_base.
+	(_Hashtable::operator=(initializer_list)): Add.
+	* include/bits/hashtable_policy.h: Convert to doxygen markup.
+	(_Hashtable_traits) New. Consolidate bool template parameters here.
+	(_Insert, _Insert_base): New, consolidated insert member functions.
+	(_Map_base, _Equality, _Rehash_base): Adjust template parameters,
+	use base types.
+	(_Hashtable_base): Move type declarations useful to other base
+	classes into this class.
+	* python/libstdcxx/v6/printers.py (Tr1HashtableIterator): Update.
+	* testsuite/23_containers/unordered_set/instantiation_neg.cc:
+	Adjust traits, line numbers.
+
 2012-04-12   Jeffrey Yasskin  <jyasskin@google.com>
 
 	PR libstdc++/52822

libstdc++-v3/python/libstdcxx/v6/printers.py

@@ -611,7 +611,7 @@ class StdStringPrinter:
 class Tr1HashtableIterator:
     def __init__ (self, hash):
         self.node = hash['_M_before_begin']['_M_nxt']
-        self.node_type = find_type(hash.type, '_Node').pointer()
+        self.node_type = find_type(hash.type, '__node_type').pointer()
 
     def __iter__ (self):
         return self

libstdc++-v3/testsuite/23_containers/unordered_set/instantiation_neg.cc

@@ -2,7 +2,7 @@
 // { dg-options "-std=gnu++0x" }
 // { dg-require-normal-mode "" }
 
-// Copyright (C) 2011 Free Software Foundation, Inc.
+// Copyright (C) 2011, 2012 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
@@ -19,7 +19,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-error "static assertion failed" "" { target *-*-* } 185 }
+// { dg-error "with noexcept" "" { target *-*-* } 248 }
 
 #include <unordered_set>
 
@@ -35,7 +35,10 @@ namespace
 void
 test01()
 {
-  std::__unordered_set<int, hash_without_noexcept,
-		       std::equal_to<int>, std::allocator<int>,
-		       false> us;
+  using traits = std::__detail::_Hashtable_traits<false, true, true>;
+  using hashtable = std::__uset_hashtable<int, hash_without_noexcept,
+					  std::equal_to<int>,
+					  std::allocator<int>, traits>;
+
+  hashtable ht;
 }