Fix a bunch of unordered container tests that were failing when _LIBCPP_DEBUG was set.

llvm-svn: 359642

18 files changed, 41 insertions, 46 deletions

diff --git a/libcxx/test/std/containers/unord/unord.map/bucket.pass.cpp b/libcxx/test/std/containers/unord/unord.map/bucket.pass.cpp
index 522b7097650..47bc933c70a 100644
--- a/libcxx/test/std/containers/unord/unord.map/bucket.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.map/bucket.pass.cpp
@@ -70,7 +70,7 @@ int main(int, char**)
     {
         typedef std::unordered_map<int, std::string> C;
         C c;
-        C::size_type i = c.bucket(3);
+        (void) c.bucket(3);
         assert(false);
     }
 #endif
diff --git a/libcxx/test/std/containers/unord/unord.map/bucket_size.pass.cpp b/libcxx/test/std/containers/unord/unord.map/bucket_size.pass.cpp
index 439d2b533bf..d46160130dd 100644
--- a/libcxx/test/std/containers/unord/unord.map/bucket_size.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.map/bucket_size.pass.cpp
@@ -74,7 +74,7 @@ int main(int, char**)
     {
         typedef std::unordered_map<int, std::string> C;
         C c;
-        C::size_type i = c.bucket_size(3);
+        (void) c.bucket_size(3);
         assert(false);
     }
 #endif
diff --git a/libcxx/test/std/containers/unord/unord.multimap/bucket.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/bucket.pass.cpp
index c6c8b217cc4..fc40eb8ad3b 100644
--- a/libcxx/test/std/containers/unord/unord.multimap/bucket.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multimap/bucket.pass.cpp
@@ -70,7 +70,7 @@ int main(int, char**)
     {
         typedef std::unordered_multimap<int, std::string> C;
         C c;
-        C::size_type i = c.bucket(3);
+        (void) c.bucket(3);
         assert(false);
     }
 #endif
diff --git a/libcxx/test/std/containers/unord/unord.multimap/bucket_size.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/bucket_size.pass.cpp
index f4919752153..64169cfe637 100644
--- a/libcxx/test/std/containers/unord/unord.multimap/bucket_size.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multimap/bucket_size.pass.cpp
@@ -78,7 +78,7 @@ int main(int, char**)
     {
         typedef std::unordered_multimap<int, std::string> C;
         C c;
-        C::size_type i = c.bucket_size(3);
+        (void) c.bucket_size(3);
         assert(false);
     }
 #endif
diff --git a/libcxx/test/std/containers/unord/unord.multiset/bucket.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/bucket.pass.cpp
index 4aeb8493320..262a840a6b1 100644
--- a/libcxx/test/std/containers/unord/unord.multiset/bucket.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multiset/bucket.pass.cpp
@@ -69,7 +69,7 @@ int main(int, char**)
     {
         typedef std::unordered_multiset<int> C;
         C c;
-        C::size_type i = c.bucket(3);
+        (void) c.bucket(3);
         assert(false);
     }
 #endif
diff --git a/libcxx/test/std/containers/unord/unord.multiset/bucket_size.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/bucket_size.pass.cpp
index 99b76972aa0..a64a1787e5f 100644
--- a/libcxx/test/std/containers/unord/unord.multiset/bucket_size.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multiset/bucket_size.pass.cpp
@@ -77,7 +77,7 @@ int main(int, char**)
     {
         typedef std::unordered_multiset<int> C;
         C c;
-        C::size_type i = c.bucket_size(3);
+        (void) c.bucket_size(3);
         assert(false);
     }
 #endif
diff --git a/libcxx/test/std/containers/unord/unord.multiset/db_iterators_7.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/db_iterators_7.pass.cpp
index 8da63023389..3b5c4582f2a 100644
--- a/libcxx/test/std/containers/unord/unord.multiset/db_iterators_7.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multiset/db_iterators_7.pass.cpp
@@ -37,7 +37,7 @@ int main(int, char**)
 #if TEST_STD_VER >= 11
     {
     typedef int T;
-    typedef std::unordered_multiset<T, min_allocator<T>> C;
+    typedef std::unordered_multiset<T, std::hash<T>, std::equal_to<T>, min_allocator<T>> C;
     C c(1);
     C::iterator i = c.begin();
     ++i;
diff --git a/libcxx/test/std/containers/unord/unord.multiset/db_iterators_8.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/db_iterators_8.pass.cpp
index 8bc1e5c168d..c86f4a28960 100644
--- a/libcxx/test/std/containers/unord/unord.multiset/db_iterators_8.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multiset/db_iterators_8.pass.cpp
@@ -29,16 +29,16 @@ int main(int, char**)
     typedef std::unordered_multiset<T> C;
     C c(1);
     C::iterator i = c.end();
-    T j = *i;
+    (void) *i;
     assert(false);
     }
 #if TEST_STD_VER >= 11
     {
     typedef int T;
-    typedef std::unordered_multiset<T, min_allocator<T>> C;
+    typedef std::unordered_multiset<T, std::hash<T>, std::equal_to<T>, min_allocator<T>> C;
     C c(1);
     C::iterator i = c.end();
-    T j = *i;
+    (void) *i;
     assert(false);
     }
 #endif
diff --git a/libcxx/test/std/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp
index fbf40ca6eab..a04ad804bac 100644
--- a/libcxx/test/std/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp
@@ -36,7 +36,7 @@ int main(int, char**)
 #if TEST_STD_VER >= 11
     {
     typedef int T;
-    typedef std::unordered_multiset<T, min_allocator<T>> C;
+    typedef std::unordered_multiset<T, std::hash<T>, std::equal_to<T>, min_allocator<T>> C;
     C c(1);
     C::local_iterator i = c.begin(0);
     ++i;
diff --git a/libcxx/test/std/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp
index 53c9c9bd58b..85e1ccacb8d 100644
--- a/libcxx/test/std/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp
@@ -29,16 +29,16 @@ int main(int, char**)
     typedef std::unordered_multiset<T> C;
     C c(1);
     C::local_iterator i = c.end(0);
-    T j = *i;
+    (void) *i;
     assert(false);
     }
 #if TEST_STD_VER >= 11
     {
     typedef int T;
-    typedef std::unordered_multiset<T, min_allocator<T>> C;
+    typedef std::unordered_multiset<T, std::hash<T>, std::equal_to<T>, min_allocator<T>> C;
     C c(1);
     C::local_iterator i = c.end(0);
-    T j = *i;
+    (void) *i;
     assert(false);
     }
 #endif
diff --git a/libcxx/test/std/containers/unord/unord.set/bucket.pass.cpp b/libcxx/test/std/containers/unord/unord.set/bucket.pass.cpp
index 2215b99493b..4b2cb0dfc9d 100644
--- a/libcxx/test/std/containers/unord/unord.set/bucket.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.set/bucket.pass.cpp
@@ -68,7 +68,7 @@ int main(int, char**)
     {
         typedef std::unordered_set<int> C;
         C c;
-        C::size_type i = c.bucket(3);
+        (void) c.bucket(3);
         assert(false);
     }
 #endif
diff --git a/libcxx/test/std/containers/unord/unord.set/bucket_size.pass.cpp b/libcxx/test/std/containers/unord/unord.set/bucket_size.pass.cpp
index 6ca89d57224..5cea7fe0482 100644
--- a/libcxx/test/std/containers/unord/unord.set/bucket_size.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.set/bucket_size.pass.cpp
@@ -72,7 +72,7 @@ int main(int, char**)
     {
         typedef std::unordered_set<int> C;
         C c;
-        C::size_type i = c.bucket_size(3);
+        (void) c.bucket_size(3);
         assert(false);
     }
 #endif
diff --git a/libcxx/test/std/containers/unord/unord.set/db_iterators_7.pass.cpp b/libcxx/test/std/containers/unord/unord.set/db_iterators_7.pass.cpp
index 8420de60d33..614a0fb9f1a 100644
--- a/libcxx/test/std/containers/unord/unord.set/db_iterators_7.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.set/db_iterators_7.pass.cpp
@@ -37,7 +37,7 @@ int main(int, char**)
 #if TEST_STD_VER >= 11
     {
     typedef int T;
-    typedef std::unordered_set<T, min_allocator<T>> C;
+    typedef std::unordered_set<T, std::hash<T>, std::equal_to<T>, min_allocator<T>> C;
     C c(1);
     C::iterator i = c.begin();
     ++i;
diff --git a/libcxx/test/std/containers/unord/unord.set/db_iterators_8.pass.cpp b/libcxx/test/std/containers/unord/unord.set/db_iterators_8.pass.cpp
index 14dccf97db0..1fd0e8ef78d 100644
--- a/libcxx/test/std/containers/unord/unord.set/db_iterators_8.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.set/db_iterators_8.pass.cpp
@@ -29,16 +29,16 @@ int main(int, char**)
     typedef std::unordered_set<T> C;
     C c(1);
     C::iterator i = c.end();
-    T j = *i;
+    (void) *i;
     assert(false);
     }
 #if TEST_STD_VER >= 11
     {
     typedef int T;
-    typedef std::unordered_set<T, min_allocator<T>> C;
+    typedef std::unordered_set<T, std::hash<T>, std::equal_to<T>, min_allocator<T>> C;
     C c(1);
     C::iterator i = c.end();
-    T j = *i;
+    (void) *i;
     assert(false);
     }
 #endif
diff --git a/libcxx/test/std/containers/unord/unord.set/db_local_iterators_7.pass.cpp b/libcxx/test/std/containers/unord/unord.set/db_local_iterators_7.pass.cpp
index ac066af7fbe..ec00103e50b 100644
--- a/libcxx/test/std/containers/unord/unord.set/db_local_iterators_7.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.set/db_local_iterators_7.pass.cpp
@@ -36,7 +36,7 @@ int main(int, char**)
 #if TEST_STD_VER >= 11
     {
     typedef int T;
-    typedef std::unordered_set<T, min_allocator<T>> C;
+    typedef std::unordered_set<T, std::hash<T>, std::equal_to<T>, min_allocator<T>> C;
     C c(1);
     C::local_iterator i = c.begin(0);
     ++i;
diff --git a/libcxx/test/std/containers/unord/unord.set/db_local_iterators_8.pass.cpp b/libcxx/test/std/containers/unord/unord.set/db_local_iterators_8.pass.cpp
index a1595cd3601..3d31858db88 100644
--- a/libcxx/test/std/containers/unord/unord.set/db_local_iterators_8.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.set/db_local_iterators_8.pass.cpp
@@ -29,16 +29,17 @@ int main(int, char**)
     typedef std::unordered_set<T> C;
     C c(1);
     C::local_iterator i = c.end(0);
-    T j = *i;
+    (void) *i;
+
     assert(false);
     }
 #if TEST_STD_VER >= 11
     {
     typedef int T;
-    typedef std::unordered_set<T, min_allocator<T>> C;
+    typedef std::unordered_set<T, std::hash<T>, std::equal_to<T>, min_allocator<T>> C;
     C c(1);
     C::local_iterator i = c.end(0);
-    T j = *i;
+    (void) *i;
     assert(false);
     }
 #endif
diff --git a/libcxx/test/std/containers/unord/unord.set/emplace_hint.pass.cpp b/libcxx/test/std/containers/unord/unord.set/emplace_hint.pass.cpp
index 55b3ccbc978..3e82bb32dd9 100644
--- a/libcxx/test/std/containers/unord/unord.set/emplace_hint.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.set/emplace_hint.pass.cpp
@@ -30,12 +30,11 @@ int main(int, char**)
         typedef std::unordered_set<Emplaceable> C;
         typedef C::iterator R;
         C c;
-        C::const_iterator e = c.end();
-        R r = c.emplace_hint(e);
+        R r = c.emplace_hint(c.end());
         assert(c.size() == 1);
         assert(*r == Emplaceable());
 
-        r = c.emplace_hint(e, Emplaceable(5, 6));
+        r = c.emplace_hint(c.end(), Emplaceable(5, 6));
         assert(c.size() == 2);
         assert(*r == Emplaceable(5, 6));
 
@@ -48,12 +47,11 @@ int main(int, char**)
                       std::equal_to<Emplaceable>, min_allocator<Emplaceable>> C;
         typedef C::iterator R;
         C c;
-        C::const_iterator e = c.end();
-        R r = c.emplace_hint(e);
+        R r = c.emplace_hint(c.end());
         assert(c.size() == 1);
         assert(*r == Emplaceable());
 
-        r = c.emplace_hint(e, Emplaceable(5, 6));
+        r = c.emplace_hint(c.end(), Emplaceable(5, 6));
         assert(c.size() == 2);
         assert(*r == Emplaceable(5, 6));
 
diff --git a/libcxx/test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp b/libcxx/test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp
index 071708e1eac..1ec66eead20 100644
--- a/libcxx/test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp
@@ -28,8 +28,7 @@ int main(int, char**)
         typedef C::iterator R;
         typedef double P;
         C c;
-        C::const_iterator e = c.end();
-        R r = c.insert(e, P(3.5));
+        R r = c.insert(c.end(), P(3.5));
         assert(c.size() == 1);
         assert(*r == 3.5);
 
@@ -37,11 +36,11 @@ int main(int, char**)
         assert(c.size() == 1);
         assert(*r == 3.5);
 
-        r = c.insert(e, P(4.5));
+        r = c.insert(c.end(), P(4.5));
         assert(c.size() == 2);
         assert(*r == 4.5);
 
-        r = c.insert(e, P(5.5));
+        r = c.insert(c.end(), P(5.5));
         assert(c.size() == 3);
         assert(*r == 5.5);
     }
@@ -51,8 +50,7 @@ int main(int, char**)
         typedef C::iterator R;
         typedef MoveOnly P;
         C c;
-        C::const_iterator e = c.end();
-        R r = c.insert(e, P(3));
+        R r = c.insert(c.end(), P(3));
         assert(c.size() == 1);
         assert(*r == 3);
 
@@ -60,11 +58,11 @@ int main(int, char**)
         assert(c.size() == 1);
         assert(*r == 3);
 
-        r = c.insert(e, P(4));
+        r = c.insert(c.end(), P(4));
         assert(c.size() == 2);
         assert(*r == 4);
 
-        r = c.insert(e, P(5));
+        r = c.insert(c.end(), P(5));
         assert(c.size() == 3);
         assert(*r == 5);
     }
@@ -74,8 +72,7 @@ int main(int, char**)
         typedef C::iterator R;
         typedef double P;
         C c;
-        C::const_iterator e = c.end();
-        R r = c.insert(e, P(3.5));
+        R r = c.insert(c.end(), P(3.5));
         assert(c.size() == 1);
         assert(*r == 3.5);
 
@@ -83,11 +80,11 @@ int main(int, char**)
         assert(c.size() == 1);
         assert(*r == 3.5);
 
-        r = c.insert(e, P(4.5));
+        r = c.insert(c.end(), P(4.5));
         assert(c.size() == 2);
         assert(*r == 4.5);
 
-        r = c.insert(e, P(5.5));
+        r = c.insert(c.end(), P(5.5));
         assert(c.size() == 3);
         assert(*r == 5.5);
     }
@@ -97,8 +94,7 @@ int main(int, char**)
         typedef C::iterator R;
         typedef MoveOnly P;
         C c;
-        C::const_iterator e = c.end();
-        R r = c.insert(e, P(3));
+        R r = c.insert(c.end(), P(3));
         assert(c.size() == 1);
         assert(*r == 3);
 
@@ -106,11 +102,11 @@ int main(int, char**)
         assert(c.size() == 1);
         assert(*r == 3);
 
-        r = c.insert(e, P(4));
+        r = c.insert(c.end(), P(4));
         assert(c.size() == 2);
         assert(*r == 4);
 
-        r = c.insert(e, P(5));
+        r = c.insert(c.end(), P(5));
         assert(c.size() == 3);
         assert(*r == 5);
     }