From 3cae9fcd3d2d90270e62a1a67060f6bf6691483c Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Wed, 1 May 2019 01:52:51 +0000 Subject: [PATCH] Fix a bunch of unordered container tests that were failing when _LIBCPP_DEBUG was set. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@359642 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../unord/unord.map/bucket.pass.cpp | 2 +- .../unord/unord.map/bucket_size.pass.cpp | 2 +- .../unord/unord.multimap/bucket.pass.cpp | 2 +- .../unord/unord.multimap/bucket_size.pass.cpp | 2 +- .../unord/unord.multiset/bucket.pass.cpp | 2 +- .../unord/unord.multiset/bucket_size.pass.cpp | 2 +- .../unord.multiset/db_iterators_7.pass.cpp | 2 +- .../unord.multiset/db_iterators_8.pass.cpp | 6 ++-- .../db_local_iterators_7.pass.cpp | 2 +- .../db_local_iterators_8.pass.cpp | 6 ++-- .../unord/unord.set/bucket.pass.cpp | 2 +- .../unord/unord.set/bucket_size.pass.cpp | 2 +- .../unord/unord.set/db_iterators_7.pass.cpp | 2 +- .../unord/unord.set/db_iterators_8.pass.cpp | 6 ++-- .../unord.set/db_local_iterators_7.pass.cpp | 2 +- .../unord.set/db_local_iterators_8.pass.cpp | 7 +++-- .../unord/unord.set/emplace_hint.pass.cpp | 10 +++---- .../unord.set/insert_hint_rvalue.pass.cpp | 28 ++++++++----------- 18 files changed, 41 insertions(+), 46 deletions(-) diff --git a/test/std/containers/unord/unord.map/bucket.pass.cpp b/test/std/containers/unord/unord.map/bucket.pass.cpp index 522b70976..47bc933c7 100644 --- a/test/std/containers/unord/unord.map/bucket.pass.cpp +++ b/test/std/containers/unord/unord.map/bucket.pass.cpp @@ -70,7 +70,7 @@ int main(int, char**) { typedef std::unordered_map C; C c; - C::size_type i = c.bucket(3); + (void) c.bucket(3); assert(false); } #endif diff --git a/test/std/containers/unord/unord.map/bucket_size.pass.cpp b/test/std/containers/unord/unord.map/bucket_size.pass.cpp index 439d2b533..d46160130 100644 --- a/test/std/containers/unord/unord.map/bucket_size.pass.cpp +++ b/test/std/containers/unord/unord.map/bucket_size.pass.cpp @@ -74,7 +74,7 @@ int main(int, char**) { typedef std::unordered_map C; C c; - C::size_type i = c.bucket_size(3); + (void) c.bucket_size(3); assert(false); } #endif diff --git a/test/std/containers/unord/unord.multimap/bucket.pass.cpp b/test/std/containers/unord/unord.multimap/bucket.pass.cpp index c6c8b217c..fc40eb8ad 100644 --- a/test/std/containers/unord/unord.multimap/bucket.pass.cpp +++ b/test/std/containers/unord/unord.multimap/bucket.pass.cpp @@ -70,7 +70,7 @@ int main(int, char**) { typedef std::unordered_multimap C; C c; - C::size_type i = c.bucket(3); + (void) c.bucket(3); assert(false); } #endif diff --git a/test/std/containers/unord/unord.multimap/bucket_size.pass.cpp b/test/std/containers/unord/unord.multimap/bucket_size.pass.cpp index f49197521..64169cfe6 100644 --- a/test/std/containers/unord/unord.multimap/bucket_size.pass.cpp +++ b/test/std/containers/unord/unord.multimap/bucket_size.pass.cpp @@ -78,7 +78,7 @@ int main(int, char**) { typedef std::unordered_multimap C; C c; - C::size_type i = c.bucket_size(3); + (void) c.bucket_size(3); assert(false); } #endif diff --git a/test/std/containers/unord/unord.multiset/bucket.pass.cpp b/test/std/containers/unord/unord.multiset/bucket.pass.cpp index 4aeb84933..262a840a6 100644 --- a/test/std/containers/unord/unord.multiset/bucket.pass.cpp +++ b/test/std/containers/unord/unord.multiset/bucket.pass.cpp @@ -69,7 +69,7 @@ int main(int, char**) { typedef std::unordered_multiset C; C c; - C::size_type i = c.bucket(3); + (void) c.bucket(3); assert(false); } #endif diff --git a/test/std/containers/unord/unord.multiset/bucket_size.pass.cpp b/test/std/containers/unord/unord.multiset/bucket_size.pass.cpp index 99b76972a..a64a1787e 100644 --- a/test/std/containers/unord/unord.multiset/bucket_size.pass.cpp +++ b/test/std/containers/unord/unord.multiset/bucket_size.pass.cpp @@ -77,7 +77,7 @@ int main(int, char**) { typedef std::unordered_multiset C; C c; - C::size_type i = c.bucket_size(3); + (void) c.bucket_size(3); assert(false); } #endif diff --git a/test/std/containers/unord/unord.multiset/db_iterators_7.pass.cpp b/test/std/containers/unord/unord.multiset/db_iterators_7.pass.cpp index 8da630233..3b5c4582f 100644 --- a/test/std/containers/unord/unord.multiset/db_iterators_7.pass.cpp +++ b/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> C; + typedef std::unordered_multiset, std::equal_to, min_allocator> C; C c(1); C::iterator i = c.begin(); ++i; diff --git a/test/std/containers/unord/unord.multiset/db_iterators_8.pass.cpp b/test/std/containers/unord/unord.multiset/db_iterators_8.pass.cpp index 8bc1e5c16..c86f4a289 100644 --- a/test/std/containers/unord/unord.multiset/db_iterators_8.pass.cpp +++ b/test/std/containers/unord/unord.multiset/db_iterators_8.pass.cpp @@ -29,16 +29,16 @@ int main(int, char**) typedef std::unordered_multiset 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> C; + typedef std::unordered_multiset, std::equal_to, min_allocator> C; C c(1); C::iterator i = c.end(); - T j = *i; + (void) *i; assert(false); } #endif diff --git a/test/std/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp b/test/std/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp index fbf40ca6e..a04ad804b 100644 --- a/test/std/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp +++ b/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> C; + typedef std::unordered_multiset, std::equal_to, min_allocator> C; C c(1); C::local_iterator i = c.begin(0); ++i; diff --git a/test/std/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp b/test/std/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp index 53c9c9bd5..85e1ccacb 100644 --- a/test/std/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp +++ b/test/std/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp @@ -29,16 +29,16 @@ int main(int, char**) typedef std::unordered_multiset 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> C; + typedef std::unordered_multiset, std::equal_to, min_allocator> C; C c(1); C::local_iterator i = c.end(0); - T j = *i; + (void) *i; assert(false); } #endif diff --git a/test/std/containers/unord/unord.set/bucket.pass.cpp b/test/std/containers/unord/unord.set/bucket.pass.cpp index 2215b9949..4b2cb0dfc 100644 --- a/test/std/containers/unord/unord.set/bucket.pass.cpp +++ b/test/std/containers/unord/unord.set/bucket.pass.cpp @@ -68,7 +68,7 @@ int main(int, char**) { typedef std::unordered_set C; C c; - C::size_type i = c.bucket(3); + (void) c.bucket(3); assert(false); } #endif diff --git a/test/std/containers/unord/unord.set/bucket_size.pass.cpp b/test/std/containers/unord/unord.set/bucket_size.pass.cpp index 6ca89d572..5cea7fe04 100644 --- a/test/std/containers/unord/unord.set/bucket_size.pass.cpp +++ b/test/std/containers/unord/unord.set/bucket_size.pass.cpp @@ -72,7 +72,7 @@ int main(int, char**) { typedef std::unordered_set C; C c; - C::size_type i = c.bucket_size(3); + (void) c.bucket_size(3); assert(false); } #endif diff --git a/test/std/containers/unord/unord.set/db_iterators_7.pass.cpp b/test/std/containers/unord/unord.set/db_iterators_7.pass.cpp index 8420de60d..614a0fb9f 100644 --- a/test/std/containers/unord/unord.set/db_iterators_7.pass.cpp +++ b/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> C; + typedef std::unordered_set, std::equal_to, min_allocator> C; C c(1); C::iterator i = c.begin(); ++i; diff --git a/test/std/containers/unord/unord.set/db_iterators_8.pass.cpp b/test/std/containers/unord/unord.set/db_iterators_8.pass.cpp index 14dccf97d..1fd0e8ef7 100644 --- a/test/std/containers/unord/unord.set/db_iterators_8.pass.cpp +++ b/test/std/containers/unord/unord.set/db_iterators_8.pass.cpp @@ -29,16 +29,16 @@ int main(int, char**) typedef std::unordered_set 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> C; + typedef std::unordered_set, std::equal_to, min_allocator> C; C c(1); C::iterator i = c.end(); - T j = *i; + (void) *i; assert(false); } #endif diff --git a/test/std/containers/unord/unord.set/db_local_iterators_7.pass.cpp b/test/std/containers/unord/unord.set/db_local_iterators_7.pass.cpp index ac066af7f..ec00103e5 100644 --- a/test/std/containers/unord/unord.set/db_local_iterators_7.pass.cpp +++ b/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> C; + typedef std::unordered_set, std::equal_to, min_allocator> C; C c(1); C::local_iterator i = c.begin(0); ++i; diff --git a/test/std/containers/unord/unord.set/db_local_iterators_8.pass.cpp b/test/std/containers/unord/unord.set/db_local_iterators_8.pass.cpp index a1595cd36..3d31858db 100644 --- a/test/std/containers/unord/unord.set/db_local_iterators_8.pass.cpp +++ b/test/std/containers/unord/unord.set/db_local_iterators_8.pass.cpp @@ -29,16 +29,17 @@ int main(int, char**) typedef std::unordered_set 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> C; + typedef std::unordered_set, std::equal_to, min_allocator> C; C c(1); C::local_iterator i = c.end(0); - T j = *i; + (void) *i; assert(false); } #endif diff --git a/test/std/containers/unord/unord.set/emplace_hint.pass.cpp b/test/std/containers/unord/unord.set/emplace_hint.pass.cpp index 55b3ccbc9..3e82bb32d 100644 --- a/test/std/containers/unord/unord.set/emplace_hint.pass.cpp +++ b/test/std/containers/unord/unord.set/emplace_hint.pass.cpp @@ -30,12 +30,11 @@ int main(int, char**) typedef std::unordered_set 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, min_allocator> 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/test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp b/test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp index 071708e1e..1ec66eead 100644 --- a/test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp +++ b/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); }