diff options
Diffstat (limited to 'test/std/containers/unord/unord.multiset/unord.multiset.cnstr')
29 files changed, 210 insertions, 207 deletions
diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp index 8d020a52ac04..867ca93fb58a 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -33,7 +34,7 @@ int main() test_allocator<NotConstructible> > C; C c(test_allocator<NotConstructible>(10)); - assert(c.bucket_count() == 0); + LIBCPP_ASSERT(c.bucket_count() == 0); assert(c.hash_function() == test_hash<std::hash<NotConstructible> >()); assert(c.key_eq() == test_compare<std::equal_to<NotConstructible> >()); assert(c.get_allocator() == test_allocator<NotConstructible>(10)); @@ -51,7 +52,7 @@ int main() min_allocator<NotConstructible> > C; C c(min_allocator<NotConstructible>{}); - assert(c.bucket_count() == 0); + LIBCPP_ASSERT(c.bucket_count() == 0); assert(c.hash_function() == test_hash<std::hash<NotConstructible> >()); assert(c.key_eq() == test_compare<std::equal_to<NotConstructible> >()); assert(c.get_allocator() == min_allocator<NotConstructible>()); @@ -61,7 +62,7 @@ int main() assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef NotConstructible T; typedef test_hash<std::hash<T>> HF; @@ -71,7 +72,7 @@ int main() A a(43); C c(3, a); - assert(c.bucket_count() == 3); + LIBCPP_ASSERT(c.bucket_count() == 3); assert(c.hash_function() == HF()); assert(c.key_eq() == Comp ()); assert(c.get_allocator() == a); @@ -92,7 +93,7 @@ int main() HF hf(42); A a(43); C c(4, hf, a); - assert(c.bucket_count() == 4); + LIBCPP_ASSERT(c.bucket_count() == 4); assert(c.hash_function() == hf); assert(!(c.hash_function() == HF())); assert(c.key_eq() == Comp ()); diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp index f219073cffcb..b7557c437181 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp @@ -18,7 +18,9 @@ #include <unordered_set> #include <cassert> #include <cfloat> +#include <cstddef> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -56,7 +58,7 @@ int main() A(4) ); c = c0; - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); C::const_iterator i = c.cbegin(); assert(*i == 1); @@ -74,8 +76,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == A(4)); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } @@ -146,8 +148,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == A(10)); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } @@ -182,7 +184,7 @@ int main() A() ); c = c0; - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); C::const_iterator i = c.cbegin(); assert(*i == 1); @@ -200,8 +202,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == A()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp index 2835cd444c30..3e42305309fd 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_set> #include <cassert> #include <cfloat> +#include <cstddef> #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -54,8 +55,8 @@ int main() assert(c.count(2) == 2); assert(c.count(3) == 1); assert(c.count(4) == 1); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } @@ -87,8 +88,8 @@ int main() assert(c.count(2) == 2); assert(c.count(3) == 1); assert(c.count(4) == 1); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp index 52d08f3e2293..658bb93e2b1a 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp @@ -18,7 +18,9 @@ #include <unordered_set> #include <cassert> #include <cfloat> +#include <cstddef> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -57,7 +59,7 @@ int main() A(4) ); c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); C::const_iterator i = c.cbegin(); assert(*i == 1); @@ -75,8 +77,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == A(4)); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } @@ -110,7 +112,7 @@ int main() A(10) ); c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -120,8 +122,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == A(10)); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } @@ -155,7 +157,7 @@ int main() A(4) ); c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -165,8 +167,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == A(10)); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } @@ -201,26 +203,18 @@ int main() A() ); c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); - C::const_iterator i = c.cbegin(); - assert(*i == 4); - ++i; - assert(*i == 3); - ++i; - assert(*i == 2); - ++i; - assert(*i == 2); - ++i; - assert(*i == 1); - ++i; - assert(*i == 1); + assert(c.count(1) == 2); + assert(c.count(2) == 2); + assert(c.count(3) == 1); + assert(c.count(4) == 1); assert(c.hash_function() == test_hash<std::hash<int> >(8)); assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == A()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } @@ -254,7 +248,7 @@ int main() A() ); c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -264,8 +258,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == A()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/compare_copy_constructible.fail.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/compare_copy_constructible.fail.cpp index b38316c37689..1cda95be6eba 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/compare_copy_constructible.fail.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/compare_copy_constructible.fail.cpp @@ -9,7 +9,7 @@ // <unordered_set> -// Check that std::unordered_set fails to instantiate if the comparison predicate is +// Check that std::unordered_set fails to instantiate if the comparison predicate is // not copy-constructible. This is LWG issue 2436 #include <unordered_set> diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp index e6042b0d9123..3ba35d7a548d 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp @@ -19,7 +19,9 @@ #include <cassert> #include <cfloat> #include <cmath> +#include <cstddef> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -50,7 +52,7 @@ int main() test_allocator<int>(10) ); C c = c0; - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); C::const_iterator i = c.cbegin(); assert(*i == 1); @@ -68,12 +70,12 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == test_allocator<int>(10)); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#ifndef _LIBCPP_HAS_NO_ADVANCED_SFINAE +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset<int, test_hash<std::hash<int> >, @@ -97,7 +99,7 @@ int main() other_allocator<int>(10) ); C c = c0; - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); C::const_iterator i = c.cbegin(); assert(*i == 1); @@ -115,13 +117,11 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == other_allocator<int>(-2)); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE -#if TEST_STD_VER >= 11 { typedef std::unordered_multiset<int, test_hash<std::hash<int> >, @@ -145,7 +145,7 @@ int main() min_allocator<int>() ); C c = c0; - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); C::const_iterator i = c.cbegin(); assert(*i == 1); @@ -163,8 +163,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == min_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp index 5e24f7257252..2c018e07734e 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp @@ -19,7 +19,9 @@ #include <cassert> #include <cfloat> #include <cmath> +#include <cstddef> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -50,7 +52,7 @@ int main() test_allocator<int>(10) ); C c(c0, test_allocator<int>(5)); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); C::const_iterator i = c.cbegin(); assert(*i == 1); @@ -68,8 +70,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == test_allocator<int>(5)); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } @@ -97,7 +99,7 @@ int main() min_allocator<int>() ); C c(c0, min_allocator<int>()); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); C::const_iterator i = c.cbegin(); assert(*i == 1); @@ -115,8 +117,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == min_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp index 02aee58525ee..4b4487f00106 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -33,7 +34,7 @@ int main() test_allocator<NotConstructible> > C; C c; - assert(c.bucket_count() == 0); + LIBCPP_ASSERT(c.bucket_count() == 0); assert(c.hash_function() == test_hash<std::hash<NotConstructible> >()); assert(c.key_eq() == test_compare<std::equal_to<NotConstructible> >()); assert(c.get_allocator() == (test_allocator<NotConstructible>())); @@ -51,7 +52,7 @@ int main() min_allocator<NotConstructible> > C; C c; - assert(c.bucket_count() == 0); + LIBCPP_ASSERT(c.bucket_count() == 0); assert(c.hash_function() == test_hash<std::hash<NotConstructible> >()); assert(c.key_eq() == test_compare<std::equal_to<NotConstructible> >()); assert(c.get_allocator() == (min_allocator<NotConstructible>())); @@ -96,7 +97,7 @@ int main() } { std::unordered_multiset<int> c = {}; - assert(c.bucket_count() == 0); + LIBCPP_ASSERT(c.bucket_count() == 0); assert(c.size() == 0); assert(c.empty()); assert(std::distance(c.begin(), c.end()) == 0); diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp index 733484510ef1..62fe51e29903 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp @@ -16,6 +16,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "test_allocator.h" @@ -54,11 +55,11 @@ int main() } { typedef std::unordered_multiset<MoveOnly, some_hash<MoveOnly>> C; - static_assert(!std::is_nothrow_destructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(!std::is_nothrow_destructible<C>::value, ""); } { typedef std::unordered_multiset<MoveOnly, std::hash<MoveOnly>, some_comp<MoveOnly>> C; - static_assert(!std::is_nothrow_destructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(!std::is_nothrow_destructible<C>::value, ""); } } diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/hash_copy_constructible.fail.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/hash_copy_constructible.fail.cpp index a43f94ca2af3..6fa52a794907 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/hash_copy_constructible.fail.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/hash_copy_constructible.fail.cpp @@ -9,7 +9,7 @@ // <unordered_set> -// Check that std::unordered_multiset fails to instantiate if the hash function is +// Check that std::unordered_multiset fails to instantiate if the hash function is // not copy-constructible. This is mentioned in LWG issue 2436 #include <unordered_set> diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp index 53a9003b0173..ced52b5e6b46 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp @@ -18,7 +18,9 @@ #include <unordered_set> #include <cassert> #include <cfloat> +#include <cstddef> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -52,8 +54,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >()); assert(c.get_allocator() == test_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } @@ -83,12 +85,12 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >()); assert(c.get_allocator() == min_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int T; typedef test_hash<std::hash<T>> HF; @@ -117,8 +119,8 @@ int main() assert(c.get_allocator() == a); assert(!(c.get_allocator() == A())); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } @@ -152,8 +154,8 @@ int main() assert(c.get_allocator() == a); assert(!(c.get_allocator() == A())); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp index e5934acc8e7c..845139f98d9c 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp @@ -19,7 +19,9 @@ #include <cassert> #include <cfloat> #include <cmath> +#include <cstddef> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -45,7 +47,7 @@ int main() }, 7 ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -55,8 +57,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >()); assert(c.get_allocator() == test_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } @@ -78,7 +80,7 @@ int main() }, 7 ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -88,8 +90,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >()); assert(c.get_allocator() == min_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp index 86253214af9c..4dc78bd261cb 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp @@ -20,7 +20,9 @@ #include <cassert> #include <cfloat> #include <cmath> +#include <cstddef> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -47,7 +49,7 @@ int main() 7, test_hash<std::hash<int> >(8) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -57,8 +59,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >()); assert(c.get_allocator() == test_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } @@ -81,7 +83,7 @@ int main() 7, test_hash<std::hash<int> >(8) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -91,8 +93,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >()); assert(c.get_allocator() == min_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp index 47469c0c5b9b..f331208596b7 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp @@ -20,7 +20,9 @@ #include <cassert> #include <cfloat> #include <cmath> +#include <cstddef> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -48,7 +50,7 @@ int main() test_hash<std::hash<int> >(8), test_compare<std::equal_to<int> >(9) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -58,8 +60,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == test_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } @@ -83,7 +85,7 @@ int main() test_hash<std::hash<int> >(8), test_compare<std::equal_to<int> >(9) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -93,8 +95,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == min_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp index d72ee6f33f50..17f064f46280 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp @@ -20,7 +20,9 @@ #include <cassert> #include <cfloat> #include <cmath> +#include <cstddef> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -49,7 +51,7 @@ int main() test_compare<std::equal_to<int> >(9), test_allocator<int>(10) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -59,8 +61,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == test_allocator<int>(10)); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } @@ -85,7 +87,7 @@ int main() test_compare<std::equal_to<int> >(9), min_allocator<int>() ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -95,8 +97,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == min_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp index defd90f408b0..9fbb773a463f 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++98, c++03 + // <unordered_set> // template <class Value, class Hash = hash<Value>, class Pred = equal_to<Value>, @@ -19,7 +21,9 @@ #include <cassert> #include <cfloat> #include <cmath> +#include <cstddef> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -27,37 +31,26 @@ int main() { -#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES { typedef std::unordered_multiset<int, test_hash<std::hash<int> >, test_compare<std::equal_to<int> >, test_allocator<int> > C; - typedef int P; - P a[] = - { - P(1), - P(2), - P(3), - P(4), - P(1), - P(2) - }; C c0(7, test_hash<std::hash<int> >(8), test_compare<std::equal_to<int> >(9), test_allocator<int>(10) ); C c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 0); assert(c.hash_function() == test_hash<std::hash<int> >(8)); assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == test_allocator<int>(10)); assert(c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); @@ -86,7 +79,7 @@ int main() test_allocator<int>(10) ); C c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -96,44 +89,33 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == test_allocator<int>(10)); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); assert(c0.empty()); } -#if TEST_STD_VER >= 11 { typedef std::unordered_multiset<int, test_hash<std::hash<int> >, test_compare<std::equal_to<int> >, min_allocator<int> > C; - typedef int P; - P a[] = - { - P(1), - P(2), - P(3), - P(4), - P(1), - P(2) - }; C c0(7, test_hash<std::hash<int> >(8), test_compare<std::equal_to<int> >(9), min_allocator<int>() ); C c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 0); assert(c.hash_function() == test_hash<std::hash<int> >(8)); assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == min_allocator<int>()); assert(c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); @@ -162,7 +144,7 @@ int main() min_allocator<int>() ); C c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -172,14 +154,13 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == min_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); assert(c0.empty()); } -#endif #if _LIBCPP_DEBUG >= 1 { std::unordered_multiset<int> s1 = {1, 2, 3}; @@ -191,5 +172,4 @@ int main() assert(s2.size() == 2); } #endif -#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES } diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp index 45b4c8b4f5d5..bc804b42e22d 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp @@ -19,7 +19,9 @@ #include <cassert> #include <cfloat> #include <cmath> +#include <cstddef> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -70,8 +72,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == A(12)); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); @@ -101,7 +103,7 @@ int main() A(10) ); C c(std::move(c0), A(10)); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -111,8 +113,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == A(10)); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); @@ -145,24 +147,16 @@ int main() C c(std::move(c0), A()); assert(c.bucket_count() >= 7); assert(c.size() == 6); - C::const_iterator i = c.cbegin(); - assert(*i == 4); - ++i; - assert(*i == 3); - ++i; - assert(*i == 2); - ++i; - assert(*i == 2); - ++i; - assert(*i == 1); - ++i; - assert(*i == 1); + assert(c.count(1) == 2); + assert(c.count(2) == 2); + assert(c.count(3) == 1); + assert(c.count(4) == 1); assert(c.hash_function() == test_hash<std::hash<int> >(8)); assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == A()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); @@ -192,7 +186,7 @@ int main() A() ); C c(std::move(c0), A()); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -202,8 +196,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == A()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp index fbd6df14c052..ac0a10a4b0ea 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp @@ -22,6 +22,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "test_allocator.h" @@ -56,7 +57,7 @@ int main() { typedef std::unordered_multiset<MoveOnly, std::hash<MoveOnly>, std::equal_to<MoveOnly>, other_allocator<MoveOnly>> C; - static_assert(std::is_nothrow_move_assignable<C>::value, ""); + LIBCPP_STATIC_ASSERT(std::is_nothrow_move_assignable<C>::value, ""); } { typedef std::unordered_multiset<MoveOnly, some_hash<MoveOnly>> C; diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp index e84ffb7b2fde..e44be18fa3b4 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp @@ -20,6 +20,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "test_allocator.h" @@ -43,17 +44,17 @@ int main() { { typedef std::unordered_multiset<MoveOnly> C; - static_assert(std::is_nothrow_move_constructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(std::is_nothrow_move_constructible<C>::value, ""); } { typedef std::unordered_multiset<MoveOnly, std::hash<MoveOnly>, std::equal_to<MoveOnly>, test_allocator<MoveOnly>> C; - static_assert(std::is_nothrow_move_constructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(std::is_nothrow_move_constructible<C>::value, ""); } { typedef std::unordered_multiset<MoveOnly, std::hash<MoveOnly>, std::equal_to<MoveOnly>, other_allocator<MoveOnly>> C; - static_assert(std::is_nothrow_move_constructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(std::is_nothrow_move_constructible<C>::value, ""); } { typedef std::unordered_multiset<MoveOnly, some_hash<MoveOnly>> C; diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp index 12679ef3e13e..a2ee746791d3 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp @@ -19,7 +19,9 @@ #include <unordered_set> #include <cassert> #include <cfloat> +#include <cstddef> +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -55,8 +57,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >()); assert(c.get_allocator() == test_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } @@ -88,12 +90,12 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >()); assert(c.get_allocator() == min_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int T; typedef test_hash<std::hash<T>> HF; @@ -122,8 +124,8 @@ int main() assert(c.get_allocator() == a); assert(!(c.get_allocator() == A())); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } @@ -157,8 +159,8 @@ int main() assert(c.get_allocator() == a); assert(!(c.get_allocator() == A())); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp index c9454cf630db..f09f9c860bd9 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp @@ -20,7 +20,9 @@ #include <cassert> #include <cfloat> #include <cmath> +#include <cstddef> +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -48,7 +50,7 @@ int main() C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])), 7 ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -58,8 +60,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >()); assert(c.get_allocator() == test_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } @@ -83,7 +85,7 @@ int main() C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])), 7 ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -93,8 +95,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >()); assert(c.get_allocator() == min_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp index 5ff61575d994..167216bf6be4 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp @@ -21,7 +21,9 @@ #include <cassert> #include <cfloat> #include <cmath> +#include <cstddef> +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -50,7 +52,7 @@ int main() 7, test_hash<std::hash<int> >(8) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -60,8 +62,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >()); assert(c.get_allocator() == test_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } @@ -86,7 +88,7 @@ int main() 7, test_hash<std::hash<int> >(8) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -96,8 +98,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >()); assert(c.get_allocator() == min_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp index ecf3176e90a4..8720f59a8fdf 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp @@ -21,7 +21,9 @@ #include <cassert> #include <cfloat> #include <cmath> +#include <cstddef> +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -51,7 +53,7 @@ int main() test_hash<std::hash<int> >(8), test_compare<std::equal_to<int> >(9) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -61,8 +63,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == test_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } @@ -88,7 +90,7 @@ int main() test_hash<std::hash<int> >(8), test_compare<std::equal_to<int> >(9) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -98,8 +100,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == min_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp index 18a092c83f6a..3373dd0d4c5e 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp @@ -22,7 +22,9 @@ #include <cassert> #include <cfloat> #include <cmath> +#include <cstddef> +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -53,7 +55,7 @@ int main() test_compare<std::equal_to<int> >(9), test_allocator<int>(10) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -63,8 +65,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == test_allocator<int>(10)); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } @@ -91,7 +93,7 @@ int main() test_compare<std::equal_to<int> >(9), min_allocator<int>() ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -101,8 +103,8 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.get_allocator() == min_allocator<int>()); assert(!c.empty()); - assert(std::distance(c.begin(), c.end()) == c.size()); - assert(std::distance(c.cbegin(), c.cend()) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.begin(), c.end())) == c.size()); + assert(static_cast<std::size_t>(std::distance(c.cbegin(), c.cend())) == c.size()); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp index 215b31fef65f..c3056d2f90f5 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp @@ -18,6 +18,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -33,7 +34,7 @@ int main() test_allocator<NotConstructible> > C; C c = 7; - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.hash_function() == test_hash<std::hash<NotConstructible> >()); assert(c.key_eq() == test_compare<std::equal_to<NotConstructible> >()); assert(c.get_allocator() == (test_allocator<NotConstructible>())); @@ -51,7 +52,7 @@ int main() min_allocator<NotConstructible> > C; C c = 7; - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.hash_function() == test_hash<std::hash<NotConstructible> >()); assert(c.key_eq() == test_compare<std::equal_to<NotConstructible> >()); assert(c.get_allocator() == (min_allocator<NotConstructible>())); diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp index 38211f958c43..c6f12e9ac8c1 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -33,7 +34,7 @@ int main() test_allocator<NotConstructible> > C; C c(7); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.hash_function() == test_hash<std::hash<NotConstructible> >()); assert(c.key_eq() == test_compare<std::equal_to<NotConstructible> >()); assert(c.get_allocator() == (test_allocator<NotConstructible>())); @@ -51,7 +52,7 @@ int main() min_allocator<NotConstructible> > C; C c(7); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.hash_function() == test_hash<std::hash<NotConstructible> >()); assert(c.key_eq() == test_compare<std::equal_to<NotConstructible> >()); assert(c.get_allocator() == (min_allocator<NotConstructible>())); diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp index baeabd1b2d08..10d48b73e7e4 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -35,7 +36,7 @@ int main() C c(7, test_hash<std::hash<NotConstructible> >(8) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.hash_function() == test_hash<std::hash<NotConstructible> >(8)); assert(c.key_eq() == test_compare<std::equal_to<NotConstructible> >()); assert(c.get_allocator() == (test_allocator<NotConstructible>())); @@ -55,7 +56,7 @@ int main() C c(7, test_hash<std::hash<NotConstructible> >(8) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.hash_function() == test_hash<std::hash<NotConstructible> >(8)); assert(c.key_eq() == test_compare<std::equal_to<NotConstructible> >()); assert(c.get_allocator() == (min_allocator<NotConstructible>())); diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp index 380f36df7bf2..6b545a1da3ba 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -36,7 +37,7 @@ int main() test_hash<std::hash<NotConstructible> >(8), test_compare<std::equal_to<NotConstructible> >(9) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.hash_function() == test_hash<std::hash<NotConstructible> >(8)); assert(c.key_eq() == test_compare<std::equal_to<NotConstructible> >(9)); assert(c.get_allocator() == (test_allocator<NotConstructible>())); @@ -57,7 +58,7 @@ int main() test_hash<std::hash<NotConstructible> >(8), test_compare<std::equal_to<NotConstructible> >(9) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.hash_function() == test_hash<std::hash<NotConstructible> >(8)); assert(c.key_eq() == test_compare<std::equal_to<NotConstructible> >(9)); assert(c.get_allocator() == (min_allocator<NotConstructible>())); diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp index 149d045e07a9..5c87a3a20dd3 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -37,7 +38,7 @@ int main() test_compare<std::equal_to<NotConstructible> >(9), test_allocator<std::pair<const NotConstructible, NotConstructible> >(10) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.hash_function() == test_hash<std::hash<NotConstructible> >(8)); assert(c.key_eq() == test_compare<std::equal_to<NotConstructible> >(9)); assert(c.get_allocator() == (test_allocator<NotConstructible>(10))); @@ -59,7 +60,7 @@ int main() test_compare<std::equal_to<NotConstructible> >(9), min_allocator<std::pair<const NotConstructible, NotConstructible> >() ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.hash_function() == test_hash<std::hash<NotConstructible> >(8)); assert(c.key_eq() == test_compare<std::equal_to<NotConstructible> >(9)); assert(c.get_allocator() == (min_allocator<NotConstructible>())); |