diff options
107 files changed, 458 insertions, 349 deletions
diff --git a/test/std/containers/unord/unord.map/bucket_count.pass.cpp b/test/std/containers/unord/unord.map/bucket_count.pass.cpp index a6d48ad8e..9ab8bfd19 100644 --- a/test/std/containers/unord/unord.map/bucket_count.pass.cpp +++ b/test/std/containers/unord/unord.map/bucket_count.pass.cpp @@ -27,7 +27,7 @@ int main() { typedef std::unordered_map<int, std::string> C; const C c; - assert(c.bucket_count() == 0); + LIBCPP_ASSERT(c.bucket_count() == 0); } { typedef std::unordered_map<int, std::string> C; @@ -51,7 +51,7 @@ int main() typedef std::unordered_map<int, std::string, std::hash<int>, std::equal_to<int>, min_allocator<std::pair<const int, std::string>>> C; const C c; - assert(c.bucket_count() == 0); + LIBCPP_ASSERT(c.bucket_count() == 0); } { typedef std::unordered_map<int, std::string, std::hash<int>, std::equal_to<int>, diff --git a/test/std/containers/unord/unord.map/rehash.pass.cpp b/test/std/containers/unord/unord.map/rehash.pass.cpp index fce751593..58222b7f9 100644 --- a/test/std/containers/unord/unord.map/rehash.pass.cpp +++ b/test/std/containers/unord/unord.map/rehash.pass.cpp @@ -19,6 +19,7 @@ #include <string> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" template <class C> @@ -56,16 +57,16 @@ int main() assert(c.bucket_count() >= 5); c.rehash(3); rehash_postcondition(c, 3); - assert(c.bucket_count() == 5); + LIBCPP_ASSERT(c.bucket_count() == 5); test(c); c.max_load_factor(2); c.rehash(3); rehash_postcondition(c, 3); - assert(c.bucket_count() == 3); + LIBCPP_ASSERT(c.bucket_count() == 3); test(c); c.rehash(31); rehash_postcondition(c, 31); - assert(c.bucket_count() == 31); + LIBCPP_ASSERT(c.bucket_count() == 31); test(c); } #if TEST_STD_VER >= 11 @@ -87,16 +88,16 @@ int main() assert(c.bucket_count() >= 5); c.rehash(3); rehash_postcondition(c, 3); - assert(c.bucket_count() == 5); + LIBCPP_ASSERT(c.bucket_count() == 5); test(c); c.max_load_factor(2); c.rehash(3); rehash_postcondition(c, 3); - assert(c.bucket_count() == 3); + LIBCPP_ASSERT(c.bucket_count() == 3); test(c); c.rehash(31); rehash_postcondition(c, 31); - assert(c.bucket_count() == 31); + LIBCPP_ASSERT(c.bucket_count() == 31); test(c); } #endif diff --git a/test/std/containers/unord/unord.map/reserve.pass.cpp b/test/std/containers/unord/unord.map/reserve.pass.cpp index 5999801a3..1836c2a41 100644 --- a/test/std/containers/unord/unord.map/reserve.pass.cpp +++ b/test/std/containers/unord/unord.map/reserve.pass.cpp @@ -19,6 +19,7 @@ #include <string> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" template <class C> @@ -64,7 +65,7 @@ int main() test(c); assert(c.bucket_count() >= 5); c.reserve(3); - assert(c.bucket_count() == 5); + LIBCPP_ASSERT(c.bucket_count() == 5); test(c); c.max_load_factor(2); c.reserve(3); @@ -92,7 +93,7 @@ int main() test(c); assert(c.bucket_count() >= 5); c.reserve(3); - assert(c.bucket_count() == 5); + LIBCPP_ASSERT(c.bucket_count() == 5); test(c); c.max_load_factor(2); c.reserve(3); diff --git a/test/std/containers/unord/unord.map/swap_member.pass.cpp b/test/std/containers/unord/unord.map/swap_member.pass.cpp index 0f98b66aa..0e90eec41 100644 --- a/test/std/containers/unord/unord.map/swap_member.pass.cpp +++ b/test/std/containers/unord/unord.map/swap_member.pass.cpp @@ -37,7 +37,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -46,7 +46,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -94,7 +94,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -123,7 +123,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -217,7 +217,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -226,7 +226,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -274,7 +274,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -303,7 +303,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -397,7 +397,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -406,7 +406,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -454,7 +454,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -483,7 +483,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp index 3c3ec058e..5253b600b 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_map> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -34,7 +35,7 @@ int main() NotConstructible> > > C; C c(test_allocator<std::pair<const NotConstructible, 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() == @@ -54,7 +55,7 @@ int main() NotConstructible> > > C; C c(min_allocator<std::pair<const NotConstructible, 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() == @@ -75,7 +76,7 @@ int main() A a(10); C c(2, a); - assert(c.bucket_count() == 2); + LIBCPP_ASSERT(c.bucket_count() == 2); assert(c.hash_function() == HF()); assert(c.key_eq() == Comp()); assert(c.get_allocator() == a); @@ -95,7 +96,7 @@ int main() A a(10); HF hf(12); C c(2, hf, a); - assert(c.bucket_count() == 2); + LIBCPP_ASSERT(c.bucket_count() == 2); assert(c.hash_function() == hf); assert(!(c.hash_function() == HF())); assert(c.key_eq() == Comp()); diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp index ee85750f5..0ef5b26f3 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp @@ -20,6 +20,7 @@ #include <cassert> #include <cfloat> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -57,7 +58,7 @@ int main() A(4) ); c = c0; - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); @@ -166,7 +167,7 @@ int main() A() ); c = c0; - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp index fe3eaee46..217f5f523 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp @@ -20,6 +20,7 @@ #include <cassert> #include <cfloat> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -58,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() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); @@ -103,7 +104,7 @@ int main() A(10) ); c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); @@ -149,7 +150,7 @@ int main() A(4) ); c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); @@ -196,7 +197,7 @@ int main() A() ); c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp index 0590d1281..1bbc600a2 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp @@ -21,6 +21,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -51,7 +52,7 @@ int main() test_allocator<std::pair<const int, std::string> >(10) ); C c = c0; - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); @@ -91,7 +92,7 @@ int main() other_allocator<std::pair<const int, std::string> >(10) ); C c = c0; - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); @@ -132,7 +133,7 @@ int main() min_allocator<std::pair<const int, std::string> >() ); C c = c0; - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp index cb60807cc..41bfc9d40 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp @@ -21,6 +21,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -51,7 +52,7 @@ int main() test_allocator<std::pair<const int, std::string> >(10) ); C c(c0, test_allocator<std::pair<const int, std::string> >(5)); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); @@ -91,7 +92,7 @@ int main() min_allocator<std::pair<const int, std::string> >() ); C c(c0, min_allocator<std::pair<const int, std::string> >()); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp index 537343a59..8d309c843 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_map> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -34,7 +35,7 @@ int main() 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() == @@ -54,7 +55,7 @@ int main() 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() == @@ -67,7 +68,7 @@ int main() } { std::unordered_map<int, 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.map/unord.map.cnstr/init_size.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp index 07e77e335..7673f79fb 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp @@ -21,6 +21,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -46,7 +47,7 @@ int main() }, 7 ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); @@ -80,7 +81,7 @@ int main() }, 7 ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp index 01aca134a..68212915e 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp @@ -21,6 +21,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -47,7 +48,7 @@ int main() 7, test_hash<std::hash<int> >(8) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); @@ -82,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() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp index 08efdbd35..126ba2428 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp @@ -22,6 +22,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -49,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() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); @@ -85,7 +86,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() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp index 02cf5e12e..156bafb10 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp @@ -22,6 +22,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -50,7 +51,7 @@ int main() test_compare<std::equal_to<int> >(9), test_allocator<std::pair<const int, std::string> >(10) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); @@ -87,7 +88,7 @@ int main() test_compare<std::equal_to<int> >(9), min_allocator<std::pair<const int, std::string> >() ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp index 0f40e349d..c4cd52161 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp @@ -23,6 +23,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -42,7 +43,7 @@ int main() test_allocator<std::pair<const int, std::string> >(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)); @@ -79,7 +80,7 @@ int main() test_allocator<std::pair<const int, std::string> >(10) ); C c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); @@ -109,7 +110,7 @@ int main() min_allocator<std::pair<const int, std::string> >() ); 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)); @@ -146,7 +147,7 @@ int main() min_allocator<std::pair<const int, std::string> >() ); C c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp index ea2043738..16586b35e 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp @@ -21,6 +21,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -94,7 +95,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() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); @@ -136,7 +137,7 @@ int main() A() ); C c(std::move(c0), A()); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp index 9af18ab61..c22149213 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp @@ -22,6 +22,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" @@ -50,7 +51,7 @@ int main() C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])), 10 ); - assert(c.bucket_count() == 11); + LIBCPP_ASSERT(c.bucket_count() == 11); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); @@ -86,7 +87,7 @@ int main() C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])), 10 ); - assert(c.bucket_count() == 11); + LIBCPP_ASSERT(c.bucket_count() == 11); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp index e23208dba..91ff7180a 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp @@ -23,6 +23,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" @@ -52,7 +53,7 @@ int main() 7, test_hash<std::hash<int> >(8) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); @@ -89,7 +90,7 @@ int main() 7, test_hash<std::hash<int> >(8) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp index d296bab32..0698d4c56 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp @@ -23,6 +23,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" @@ -53,7 +54,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() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); @@ -91,7 +92,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() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp index 638efcfeb..f01efd093 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp @@ -24,6 +24,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" @@ -55,7 +56,7 @@ int main() test_compare<std::equal_to<int> >(9), test_allocator<std::pair<const int, std::string> >(10) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); @@ -94,7 +95,7 @@ int main() test_compare<std::equal_to<int> >(9), min_allocator<std::pair<const int, std::string> >() ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp index d2551861e..94833c232 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp @@ -18,6 +18,7 @@ #include <unordered_map> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -34,7 +35,7 @@ int main() 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() == @@ -54,7 +55,7 @@ int main() 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() == diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp index 465dea21b..acf6b11fe 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_map> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -34,7 +35,7 @@ int main() 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() == @@ -54,7 +55,7 @@ int main() 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() == diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp index f70ad7a1e..42a248cc1 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_map> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -36,7 +37,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() == @@ -58,7 +59,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() == diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp index 184d77d69..820a3652e 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_map> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -37,7 +38,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() == @@ -60,7 +61,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() == diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp index 56eb59ddb..84d4795ac 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_map> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -38,7 +39,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() == @@ -62,7 +63,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() == diff --git a/test/std/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp b/test/std/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp index f3d51f6da..b5f5f8979 100644 --- a/test/std/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp @@ -37,7 +37,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -46,7 +46,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -94,7 +94,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -123,7 +123,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -217,7 +217,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -226,7 +226,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -274,7 +274,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -303,7 +303,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -397,7 +397,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -406,7 +406,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -454,7 +454,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -483,7 +483,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); diff --git a/test/std/containers/unord/unord.multimap/bucket_count.pass.cpp b/test/std/containers/unord/unord.multimap/bucket_count.pass.cpp index 9e04438e0..4eea3d0f6 100644 --- a/test/std/containers/unord/unord.multimap/bucket_count.pass.cpp +++ b/test/std/containers/unord/unord.multimap/bucket_count.pass.cpp @@ -19,6 +19,8 @@ #include <string> #include <cassert> +#include "test_macros.h" + int main() { { @@ -26,7 +28,7 @@ int main() typedef C::const_iterator I; typedef std::pair<int, std::string> P; const C c; - assert(c.bucket_count() == 0); + LIBCPP_ASSERT(c.bucket_count() == 0); } { typedef std::unordered_multimap<int, std::string> C; diff --git a/test/std/containers/unord/unord.multimap/iterators.fail.cpp b/test/std/containers/unord/unord.multimap/iterators.fail.cpp index d0adb2c25..5ecaba4e5 100644 --- a/test/std/containers/unord/unord.multimap/iterators.fail.cpp +++ b/test/std/containers/unord/unord.multimap/iterators.fail.cpp @@ -24,6 +24,8 @@ #include <string> #include <cassert> +#include "test_macros.h" + int main() { { @@ -39,7 +41,7 @@ int main() P(2, "four"), }; C c(a, a + sizeof(a)/sizeof(a[0])); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(std::distance(c.begin(), c.end()) == c.size()); assert(std::distance(c.cbegin(), c.cend()) == c.size()); @@ -61,7 +63,7 @@ int main() P(2, "four"), }; const C c(a, a + sizeof(a)/sizeof(a[0])); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(std::distance(c.begin(), c.end()) == c.size()); assert(std::distance(c.cbegin(), c.cend()) == c.size()); diff --git a/test/std/containers/unord/unord.multimap/local_iterators.fail.cpp b/test/std/containers/unord/unord.multimap/local_iterators.fail.cpp index 5f66cfe28..064e1b1bd 100644 --- a/test/std/containers/unord/unord.multimap/local_iterators.fail.cpp +++ b/test/std/containers/unord/unord.multimap/local_iterators.fail.cpp @@ -24,6 +24,8 @@ #include <string> #include <cassert> +#include "test_macros.h" + int main() { { @@ -40,7 +42,7 @@ int main() P(2, "four"), }; C c(a, a + sizeof(a)/sizeof(a[0])); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); C::size_type b = c.bucket(0); I i = c.begin(b); I j = c.end(b); @@ -105,7 +107,7 @@ int main() P(2, "four"), }; const C c(a, a + sizeof(a)/sizeof(a[0])); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); C::size_type b = c.bucket(0); I i = c.begin(b); I j = c.end(b); @@ -169,7 +171,7 @@ int main() P(2, "four"), }; C c(a, a + sizeof(a)/sizeof(a[0])); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); C::size_type b = c.bucket(0); I i = c.cbegin(b); I j = c.cend(b); @@ -233,7 +235,7 @@ int main() P(2, "four"), }; const C c(a, a + sizeof(a)/sizeof(a[0])); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); C::size_type b = c.bucket(0); I i = c.cbegin(b); I j = c.cend(b); diff --git a/test/std/containers/unord/unord.multimap/rehash.pass.cpp b/test/std/containers/unord/unord.multimap/rehash.pass.cpp index c099abe2a..ede473837 100644 --- a/test/std/containers/unord/unord.multimap/rehash.pass.cpp +++ b/test/std/containers/unord/unord.multimap/rehash.pass.cpp @@ -21,6 +21,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "min_allocator.h" template <class C> @@ -85,16 +86,16 @@ int main() assert(c.bucket_count() >= 7); c.rehash(3); rehash_postcondition(c, 3); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); test(c); c.max_load_factor(2); c.rehash(3); rehash_postcondition(c, 3); - assert(c.bucket_count() == 3); + LIBCPP_ASSERT(c.bucket_count() == 3); test(c); c.rehash(31); rehash_postcondition(c, 31); - assert(c.bucket_count() == 31); + LIBCPP_ASSERT(c.bucket_count() == 31); test(c); } #if TEST_STD_VER >= 11 @@ -116,16 +117,16 @@ int main() assert(c.bucket_count() >= 7); c.rehash(3); rehash_postcondition(c, 3); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); test(c); c.max_load_factor(2); c.rehash(3); rehash_postcondition(c, 3); - assert(c.bucket_count() == 3); + LIBCPP_ASSERT(c.bucket_count() == 3); test(c); c.rehash(31); rehash_postcondition(c, 31); - assert(c.bucket_count() == 31); + LIBCPP_ASSERT(c.bucket_count() == 31); test(c); } #endif diff --git a/test/std/containers/unord/unord.multimap/reserve.pass.cpp b/test/std/containers/unord/unord.multimap/reserve.pass.cpp index 3f76da11e..d86c69c88 100644 --- a/test/std/containers/unord/unord.multimap/reserve.pass.cpp +++ b/test/std/containers/unord/unord.multimap/reserve.pass.cpp @@ -19,6 +19,7 @@ #include <string> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" template <class C> @@ -66,11 +67,11 @@ int main() test(c); assert(c.bucket_count() >= 7); c.reserve(3); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); test(c); c.max_load_factor(2); c.reserve(3); - assert(c.bucket_count() == 3); + LIBCPP_ASSERT(c.bucket_count() == 3); test(c); c.reserve(31); assert(c.bucket_count() >= 16); @@ -94,11 +95,11 @@ int main() test(c); assert(c.bucket_count() >= 7); c.reserve(3); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); test(c); c.max_load_factor(2); c.reserve(3); - assert(c.bucket_count() == 3); + LIBCPP_ASSERT(c.bucket_count() == 3); test(c); c.reserve(31); assert(c.bucket_count() >= 16); diff --git a/test/std/containers/unord/unord.multimap/swap_member.pass.cpp b/test/std/containers/unord/unord.multimap/swap_member.pass.cpp index 4653cc32e..a49a7ae19 100644 --- a/test/std/containers/unord/unord.multimap/swap_member.pass.cpp +++ b/test/std/containers/unord/unord.multimap/swap_member.pass.cpp @@ -19,6 +19,7 @@ #include <string> #include <cassert> +#include "test_macros.h" #include "../../test_compare.h" #include "../../test_hash.h" #include "test_allocator.h" @@ -38,7 +39,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -47,7 +48,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -95,7 +96,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -124,7 +125,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -223,7 +224,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -232,7 +233,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -280,7 +281,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -309,7 +310,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -408,7 +409,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -417,7 +418,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -465,7 +466,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -494,7 +495,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp index 6eb258db4..2005f00a7 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_map> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -34,7 +35,7 @@ int main() NotConstructible> > > C; C c(test_allocator<std::pair<const NotConstructible, 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() == @@ -54,7 +55,7 @@ int main() NotConstructible> > > C; C c(min_allocator<std::pair<const NotConstructible, 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() == @@ -75,7 +76,7 @@ int main() A a(10); C c(2, a); - assert(c.bucket_count() == 2); + LIBCPP_ASSERT(c.bucket_count() == 2); assert(c.hash_function() == HF()); assert(c.key_eq() == Comp()); assert(c.get_allocator() == a); @@ -95,7 +96,7 @@ int main() A a(10); HF hf(12); C c(2, hf, a); - assert(c.bucket_count() == 2); + LIBCPP_ASSERT(c.bucket_count() == 2); assert(c.hash_function() == hf); assert(!(c.hash_function() == HF())); assert(c.key_eq() == Comp()); diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp index 5634a79ef..6efe93437 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp @@ -20,6 +20,7 @@ #include <cassert> #include <cfloat> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -57,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->first == 1); @@ -194,7 +195,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->first == 1); diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp index ed8d792e8..a89c9dbb4 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp @@ -20,6 +20,7 @@ #include <cassert> #include <cfloat> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -58,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); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); @@ -123,7 +124,7 @@ int main() A(10) ); c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); @@ -188,7 +189,7 @@ int main() A(4) ); c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); @@ -254,7 +255,7 @@ int main() A() ); c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp index 7b0adda18..5527b1d4e 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp @@ -21,6 +21,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -51,7 +52,7 @@ int main() test_allocator<std::pair<const int, std::string> >(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->first == 1); @@ -105,7 +106,7 @@ int main() other_allocator<std::pair<const int, std::string> >(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->first == 1); @@ -160,7 +161,7 @@ int main() min_allocator<std::pair<const int, std::string> >() ); 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->first == 1); diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp index e759267b4..b91aea030 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp @@ -21,6 +21,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -51,7 +52,7 @@ int main() test_allocator<std::pair<const int, std::string> >(10) ); C c(c0, test_allocator<std::pair<const int, std::string> >(5)); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); C::const_iterator i = c.cbegin(); assert(i->first == 1); @@ -105,7 +106,7 @@ int main() min_allocator<std::pair<const int, std::string> >() ); C c(c0, min_allocator<std::pair<const int, std::string> >()); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); C::const_iterator i = c.cbegin(); assert(i->first == 1); diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp index f361b2c3d..1cb2de7a6 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_map> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -34,7 +35,7 @@ int main() 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() == @@ -54,7 +55,7 @@ int main() 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() == @@ -67,7 +68,7 @@ int main() } { std::unordered_multimap<int, 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.multimap/unord.multimap.cnstr/init_size.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp index 5dc432349..69fd0a35d 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp @@ -21,6 +21,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -46,7 +47,7 @@ int main() }, 7 ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); @@ -102,7 +103,7 @@ int main() }, 7 ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp index 8bcbd0bdc..4dc7c9179 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp @@ -21,6 +21,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -47,7 +48,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); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); @@ -104,7 +105,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); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp index 8dda376db..77f91bb9f 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp @@ -22,6 +22,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -49,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); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); @@ -107,7 +108,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); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp index 6843613b0..a003196f9 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp @@ -22,6 +22,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -50,7 +51,7 @@ int main() test_compare<std::equal_to<int> >(9), test_allocator<std::pair<const int, std::string> >(10) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); @@ -109,7 +110,7 @@ int main() test_compare<std::equal_to<int> >(9), min_allocator<std::pair<const int, std::string> >() ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp index 58d1424d8..ccd4237cd 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp @@ -21,6 +21,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -51,7 +52,7 @@ int main() test_allocator<std::pair<const int, std::string> >(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)); @@ -88,7 +89,7 @@ int main() test_allocator<std::pair<const int, std::string> >(10) ); C c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); @@ -151,7 +152,7 @@ int main() min_allocator<std::pair<const int, std::string> >() ); 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)); @@ -188,7 +189,7 @@ int main() min_allocator<std::pair<const int, std::string> >() ); C c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp index a66e41e8e..11942cf48 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp @@ -23,6 +23,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -119,7 +120,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); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); @@ -184,7 +185,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); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp index 15b31b519..6385a9e45 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp @@ -22,6 +22,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" @@ -50,7 +51,7 @@ int main() C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])), 10 ); - assert(c.bucket_count() == 11); + LIBCPP_ASSERT(c.bucket_count() == 11); assert(c.size() == 6); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); @@ -108,7 +109,7 @@ int main() C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])), 10 ); - assert(c.bucket_count() == 11); + LIBCPP_ASSERT(c.bucket_count() == 11); assert(c.size() == 6); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp index f565f10c8..185bd5390 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp @@ -23,6 +23,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" @@ -52,7 +53,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); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); @@ -111,7 +112,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); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp index 8f86befbe..311531121 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp @@ -23,6 +23,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" @@ -53,7 +54,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); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); @@ -113,7 +114,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); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp index e8040d88d..f5b2bbe84 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp @@ -24,6 +24,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" @@ -55,7 +56,7 @@ int main() test_compare<std::equal_to<int> >(9), test_allocator<std::pair<const int, std::string> >(10) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); @@ -116,7 +117,7 @@ int main() test_compare<std::equal_to<int> >(9), min_allocator<std::pair<const int, std::string> >() ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); typedef std::pair<C::const_iterator, C::const_iterator> Eq; Eq eq = c.equal_range(1); diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp index 38e6c60df..b76fbc0ba 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp @@ -18,6 +18,7 @@ #include <unordered_map> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -34,7 +35,7 @@ int main() 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() == @@ -54,7 +55,7 @@ int main() 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() == diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp index 8aad66261..ae3d4f816 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_map> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -34,7 +35,7 @@ int main() 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() == @@ -54,7 +55,7 @@ int main() 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() == diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp index 2cc6c0176..742d4f291 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_map> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -36,7 +37,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() == @@ -58,7 +59,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() == diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp index ebfce9fec..88cce517c 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_map> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -37,7 +38,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() == @@ -60,7 +61,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() == diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp index 56e380898..764bf93f3 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_map> #include <cassert> +#include "test_macros.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -38,7 +39,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() == @@ -62,7 +63,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() == diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp index 84911ba01..b00562734 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp @@ -19,6 +19,7 @@ #include <string> #include <cassert> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -37,7 +38,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -46,7 +47,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -94,7 +95,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -123,7 +124,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -222,7 +223,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -231,7 +232,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -279,7 +280,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -308,7 +309,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -407,7 +408,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -416,7 +417,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -464,7 +465,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -493,7 +494,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); diff --git a/test/std/containers/unord/unord.multiset/bucket_count.pass.cpp b/test/std/containers/unord/unord.multiset/bucket_count.pass.cpp index cdab8a4fd..ec4d0e675 100644 --- a/test/std/containers/unord/unord.multiset/bucket_count.pass.cpp +++ b/test/std/containers/unord/unord.multiset/bucket_count.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" int main() @@ -27,7 +28,7 @@ int main() typedef C::const_iterator I; typedef int P; const C c; - assert(c.bucket_count() == 0); + LIBCPP_ASSERT(c.bucket_count() == 0); } { typedef std::unordered_multiset<int> C; @@ -54,7 +55,7 @@ int main() typedef C::const_iterator I; typedef int P; const C c; - assert(c.bucket_count() == 0); + LIBCPP_ASSERT(c.bucket_count() == 0); } { typedef std::unordered_multiset<int, std::hash<int>, diff --git a/test/std/containers/unord/unord.multiset/iterators.fail.cpp b/test/std/containers/unord/unord.multiset/iterators.fail.cpp index f78bccbd4..9f309a234 100644 --- a/test/std/containers/unord/unord.multiset/iterators.fail.cpp +++ b/test/std/containers/unord/unord.multiset/iterators.fail.cpp @@ -23,6 +23,8 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" + int main() { { @@ -38,7 +40,7 @@ int main() P(2) }; C c(a, a + sizeof(a)/sizeof(a[0])); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(std::distance(c.begin(), c.end()) == c.size()); assert(std::distance(c.cbegin(), c.cend()) == c.size()); @@ -59,7 +61,7 @@ int main() P(2) }; const C c(a, a + sizeof(a)/sizeof(a[0])); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 6); assert(std::distance(c.begin(), c.end()) == c.size()); assert(std::distance(c.cbegin(), c.cend()) == c.size()); diff --git a/test/std/containers/unord/unord.multiset/local_iterators.fail.cpp b/test/std/containers/unord/unord.multiset/local_iterators.fail.cpp index 4118987c2..a43e49357 100644 --- a/test/std/containers/unord/unord.multiset/local_iterators.fail.cpp +++ b/test/std/containers/unord/unord.multiset/local_iterators.fail.cpp @@ -23,6 +23,8 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" + int main() { { @@ -39,7 +41,7 @@ int main() P(2) }; C c(a, a + sizeof(a)/sizeof(a[0])); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); C::size_type b = c.bucket(0); I i = c.begin(b); I j = c.end(b); @@ -98,7 +100,7 @@ int main() P(2) }; const C c(a, a + sizeof(a)/sizeof(a[0])); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); C::size_type b = c.bucket(0); I i = c.begin(b); I j = c.end(b); @@ -156,7 +158,7 @@ int main() P(2) }; C c(a, a + sizeof(a)/sizeof(a[0])); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); C::size_type b = c.bucket(0); I i = c.cbegin(b); I j = c.cend(b); @@ -214,7 +216,7 @@ int main() P(2) }; const C c(a, a + sizeof(a)/sizeof(a[0])); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); C::size_type b = c.bucket(0); I i = c.cbegin(b); I j = c.cend(b); diff --git a/test/std/containers/unord/unord.multiset/rehash.pass.cpp b/test/std/containers/unord/unord.multiset/rehash.pass.cpp index 3ad16a6bc..2c5d50995 100644 --- a/test/std/containers/unord/unord.multiset/rehash.pass.cpp +++ b/test/std/containers/unord/unord.multiset/rehash.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" template <class C> @@ -55,16 +56,16 @@ int main() assert(c.bucket_count() >= 7); c.rehash(3); rehash_postcondition(c, 3); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); test(c); c.max_load_factor(2); c.rehash(3); rehash_postcondition(c, 3); - assert(c.bucket_count() == 3); + LIBCPP_ASSERT(c.bucket_count() == 3); test(c); c.rehash(31); rehash_postcondition(c, 31); - assert(c.bucket_count() == 31); + LIBCPP_ASSERT(c.bucket_count() == 31); test(c); } #if TEST_STD_VER >= 11 @@ -86,16 +87,16 @@ int main() assert(c.bucket_count() >= 7); c.rehash(3); rehash_postcondition(c, 3); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); test(c); c.max_load_factor(2); c.rehash(3); rehash_postcondition(c, 3); - assert(c.bucket_count() == 3); + LIBCPP_ASSERT(c.bucket_count() == 3); test(c); c.rehash(31); rehash_postcondition(c, 31); - assert(c.bucket_count() == 31); + LIBCPP_ASSERT(c.bucket_count() == 31); test(c); } #endif diff --git a/test/std/containers/unord/unord.multiset/reserve.pass.cpp b/test/std/containers/unord/unord.multiset/reserve.pass.cpp index 52d51011f..28187e9ca 100644 --- a/test/std/containers/unord/unord.multiset/reserve.pass.cpp +++ b/test/std/containers/unord/unord.multiset/reserve.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" template <class C> @@ -63,11 +64,11 @@ int main() test(c); assert(c.bucket_count() >= 7); c.reserve(3); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); test(c); c.max_load_factor(2); c.reserve(3); - assert(c.bucket_count() == 3); + LIBCPP_ASSERT(c.bucket_count() == 3); test(c); c.reserve(31); assert(c.bucket_count() >= 16); @@ -91,11 +92,11 @@ int main() test(c); assert(c.bucket_count() >= 7); c.reserve(3); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); test(c); c.max_load_factor(2); c.reserve(3); - assert(c.bucket_count() == 3); + LIBCPP_ASSERT(c.bucket_count() == 3); test(c); c.reserve(31); assert(c.bucket_count() >= 16); diff --git a/test/std/containers/unord/unord.multiset/swap_member.pass.cpp b/test/std/containers/unord/unord.multiset/swap_member.pass.cpp index bc3314c86..717a86bdf 100644 --- a/test/std/containers/unord/unord.multiset/swap_member.pass.cpp +++ b/test/std/containers/unord/unord.multiset/swap_member.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "../../test_compare.h" #include "../../test_hash.h" #include "test_allocator.h" @@ -36,7 +37,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -45,7 +46,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -93,7 +94,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -122,7 +123,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -217,7 +218,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -226,7 +227,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -274,7 +275,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -303,7 +304,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -398,7 +399,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -407,7 +408,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -455,7 +456,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -484,7 +485,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); 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 8d020a52a..8e29aa002 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>()); @@ -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 f219073cf..b0a110f0b 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 @@ -19,6 +19,7 @@ #include <cassert> #include <cfloat> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -56,7 +57,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); @@ -182,7 +183,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); 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 52d08f3e2..35bbce2d6 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 @@ -19,6 +19,7 @@ #include <cassert> #include <cfloat> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -57,7 +58,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); @@ -110,7 +111,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); @@ -155,7 +156,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); @@ -201,7 +202,7 @@ 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); @@ -254,7 +255,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); 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 e6042b0d9..a8d076415 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 @@ -20,6 +20,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -50,7 +51,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); @@ -97,7 +98,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); @@ -145,7 +146,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); 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 5e24f7257..2b47200d2 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 @@ -20,6 +20,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -50,7 +51,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); @@ -97,7 +98,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); 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 e741f3208..da6cbe826 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>())); @@ -63,7 +64,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/init_size.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp index e5934acc8..7ffbae797 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 @@ -20,6 +20,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -45,7 +46,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); @@ -78,7 +79,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); 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 86253214a..87dd0a8b5 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 @@ -21,6 +21,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -47,7 +48,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); @@ -81,7 +82,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); 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 47469c0c5..7f630d8ee 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 @@ -21,6 +21,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -48,7 +49,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); @@ -83,7 +84,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); 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 d72ee6f33..eb50a4941 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 @@ -21,6 +21,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -49,7 +50,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); @@ -85,7 +86,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); 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 defd90f40..fc4ea964f 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 @@ -20,6 +20,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -50,7 +51,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() == 0); assert(c.hash_function() == test_hash<std::hash<int> >(8)); assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); @@ -86,7 +87,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); @@ -126,7 +127,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() == 0); assert(c.hash_function() == test_hash<std::hash<int> >(8)); assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); @@ -162,7 +163,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); 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 45b4c8b4f..be7c22eb3 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 @@ -20,6 +20,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -101,7 +102,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); @@ -192,7 +193,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); 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 c9454cf63..2ee8be120 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 @@ -21,6 +21,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -48,7 +49,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); @@ -83,7 +84,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); 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 5ff61575d..af1e15bd4 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 @@ -22,6 +22,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -50,7 +51,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); @@ -86,7 +87,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); 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 ecf3176e9..20e048a98 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 @@ -22,6 +22,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -51,7 +52,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); @@ -88,7 +89,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); 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 18a092c83..f75f84e84 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 @@ -23,6 +23,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -53,7 +54,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); @@ -91,7 +92,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); 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 215b31fef..c3056d2f9 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 38211f958..c6f12e9ac 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 baeabd1b2..10d48b73e 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 380f36df7..6b545a1da 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 149d045e0..5c87a3a20 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>())); diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp index 4b1c12950..a8504f1b4 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -36,7 +37,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -45,7 +46,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -93,7 +94,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -122,7 +123,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -217,7 +218,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -226,7 +227,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -274,7 +275,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -303,7 +304,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -398,7 +399,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -407,7 +408,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -455,7 +456,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -484,7 +485,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); diff --git a/test/std/containers/unord/unord.set/bucket_count.pass.cpp b/test/std/containers/unord/unord.set/bucket_count.pass.cpp index 05d8a7d5a..6f1f526ab 100644 --- a/test/std/containers/unord/unord.set/bucket_count.pass.cpp +++ b/test/std/containers/unord/unord.set/bucket_count.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" int main() @@ -27,7 +28,7 @@ int main() typedef C::const_iterator I; typedef int P; const C c; - assert(c.bucket_count() == 0); + LIBCPP_ASSERT(c.bucket_count() == 0); } { typedef std::unordered_set<int> C; @@ -53,7 +54,7 @@ int main() typedef C::const_iterator I; typedef int P; const C c; - assert(c.bucket_count() == 0); + LIBCPP_ASSERT(c.bucket_count() == 0); } { typedef std::unordered_set<int, std::hash<int>, std::equal_to<int>, min_allocator<int>> C; diff --git a/test/std/containers/unord/unord.set/rehash.pass.cpp b/test/std/containers/unord/unord.set/rehash.pass.cpp index a4d4d3fbf..fd689bfd9 100644 --- a/test/std/containers/unord/unord.set/rehash.pass.cpp +++ b/test/std/containers/unord/unord.set/rehash.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" template <class C> @@ -55,16 +56,16 @@ int main() assert(c.bucket_count() >= 5); c.rehash(3); rehash_postcondition(c, 3); - assert(c.bucket_count() == 5); + LIBCPP_ASSERT(c.bucket_count() == 5); test(c); c.max_load_factor(2); c.rehash(3); rehash_postcondition(c, 3); - assert(c.bucket_count() == 3); + LIBCPP_ASSERT(c.bucket_count() == 3); test(c); c.rehash(31); rehash_postcondition(c, 31); - assert(c.bucket_count() == 31); + LIBCPP_ASSERT(c.bucket_count() == 31); test(c); } #if TEST_STD_VER >= 11 @@ -86,16 +87,16 @@ int main() assert(c.bucket_count() >= 5); c.rehash(3); rehash_postcondition(c, 3); - assert(c.bucket_count() == 5); + LIBCPP_ASSERT(c.bucket_count() == 5); test(c); c.max_load_factor(2); c.rehash(3); rehash_postcondition(c, 3); - assert(c.bucket_count() == 3); + LIBCPP_ASSERT(c.bucket_count() == 3); test(c); c.rehash(31); rehash_postcondition(c, 31); - assert(c.bucket_count() == 31); + LIBCPP_ASSERT(c.bucket_count() == 31); test(c); } #endif diff --git a/test/std/containers/unord/unord.set/reserve.pass.cpp b/test/std/containers/unord/unord.set/reserve.pass.cpp index 4bd5332f0..c48a72560 100644 --- a/test/std/containers/unord/unord.set/reserve.pass.cpp +++ b/test/std/containers/unord/unord.set/reserve.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" template <class C> @@ -63,7 +64,7 @@ int main() test(c); assert(c.bucket_count() >= 5); c.reserve(3); - assert(c.bucket_count() == 5); + LIBCPP_ASSERT(c.bucket_count() == 5); test(c); c.max_load_factor(2); c.reserve(3); @@ -91,7 +92,7 @@ int main() test(c); assert(c.bucket_count() >= 5); c.reserve(3); - assert(c.bucket_count() == 5); + LIBCPP_ASSERT(c.bucket_count() == 5); test(c); c.max_load_factor(2); c.reserve(3); diff --git a/test/std/containers/unord/unord.set/swap_member.pass.cpp b/test/std/containers/unord/unord.set/swap_member.pass.cpp index 5ddb2d00d..d702609af 100644 --- a/test/std/containers/unord/unord.set/swap_member.pass.cpp +++ b/test/std/containers/unord/unord.set/swap_member.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "../../test_compare.h" #include "../../test_hash.h" #include "test_allocator.h" @@ -36,7 +37,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -45,7 +46,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -93,7 +94,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -122,7 +123,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -217,7 +218,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -226,7 +227,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -274,7 +275,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -303,7 +304,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -398,7 +399,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -407,7 +408,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -455,7 +456,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -484,7 +485,7 @@ int main() c2.max_load_factor(2); c1.swap(c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp index d0b03b2cd..243037916 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.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>()); @@ -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.set/unord.set.cnstr/assign_copy.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp index 05cb0525e..a1923d6b8 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp @@ -19,6 +19,7 @@ #include <cassert> #include <cfloat> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -56,7 +57,7 @@ int main() A(4) ); c = c0; - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); @@ -165,7 +166,7 @@ int main() A() ); c = c0; - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp index d8732268b..b4d54cc37 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp @@ -19,6 +19,7 @@ #include <cassert> #include <cfloat> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -57,7 +58,7 @@ int main() A(4) ); c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); @@ -102,7 +103,7 @@ int main() A(10) ); c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); @@ -147,7 +148,7 @@ int main() A(4) ); c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); @@ -193,7 +194,7 @@ int main() A() ); c = std::move(c0); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp index 07278be79..493c62cfe 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp @@ -20,6 +20,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -50,7 +51,7 @@ int main() test_allocator<int>(10) ); C c = c0; - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); @@ -89,7 +90,7 @@ int main() other_allocator<int>(10) ); C c = c0; - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); @@ -129,7 +130,7 @@ int main() min_allocator<int>() ); C c = c0; - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp index 59f4bfabd..1e0344daa 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp @@ -20,6 +20,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -50,7 +51,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() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); @@ -89,7 +90,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() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp index e53f381f2..3af90952d 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.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>())); @@ -63,7 +64,7 @@ int main() } { std::unordered_set<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.set/unord.set.cnstr/init_size.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp index b7eed1e5b..a9a721d62 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp @@ -20,6 +20,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -45,7 +46,7 @@ int main() }, 7 ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); @@ -78,7 +79,7 @@ int main() }, 7 ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp index 735babd52..b0cded7ed 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp @@ -21,6 +21,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -47,7 +48,7 @@ int main() 7, test_hash<std::hash<int> >(8) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); @@ -81,7 +82,7 @@ int main() 7, test_hash<std::hash<int> >(8) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp index 643a57fa9..f21d526fe 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp @@ -21,6 +21,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -48,7 +49,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() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); @@ -83,7 +84,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() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp index 72b9ed2a1..54de7e6b2 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp @@ -21,6 +21,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -49,7 +50,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() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); @@ -85,7 +86,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() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp index e86598633..b716d60c2 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp @@ -20,6 +20,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -50,7 +51,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() == 0); assert(c.hash_function() == test_hash<std::hash<int> >(8)); assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); @@ -86,7 +87,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() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); @@ -126,7 +127,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() == 0); assert(c.hash_function() == test_hash<std::hash<int> >(8)); assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); @@ -162,7 +163,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() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp index b87d5615e..1db71e791 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp @@ -21,6 +21,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -48,7 +49,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() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); @@ -83,7 +84,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() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp index 7234d8a80..ecddff689 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp @@ -22,6 +22,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -50,7 +51,7 @@ int main() 7, test_hash<std::hash<int> >(8) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); @@ -86,7 +87,7 @@ int main() 7, test_hash<std::hash<int> >(8) ); - assert(c.bucket_count() == 7); + LIBCPP_ASSERT(c.bucket_count() == 7); assert(c.size() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp index bcf3058aa..b6f33ab84 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp @@ -22,6 +22,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -51,7 +52,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() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); @@ -88,7 +89,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() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp index ad9b414d7..7cd465c4b 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp @@ -23,6 +23,7 @@ #include <cfloat> #include <cmath> +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -53,7 +54,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() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); @@ -91,7 +92,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() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp index 389c54c58..b1ee87f8f 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp +++ b/test/std/containers/unord/unord.set/unord.set.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" @@ -32,7 +33,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>())); diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp index 88e499773..5b5e861cd 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.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.set/unord.set.cnstr/size_hash.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp index eb98dcc7b..5c77839ff 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.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.set/unord.set.cnstr/size_hash_equal.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp index 4ae012038..db49bd0e7 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.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.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp index b2ddbe94e..3958ce467 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.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<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<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>())); diff --git a/test/std/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp b/test/std/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp index 2755b5285..75514f54c 100644 --- a/test/std/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp @@ -18,6 +18,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -36,7 +37,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -45,7 +46,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -93,7 +94,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -122,7 +123,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -217,7 +218,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -226,7 +227,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -274,7 +275,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -303,7 +304,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -398,7 +399,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); @@ -407,7 +408,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -455,7 +456,7 @@ int main() assert(std::distance(c1.cbegin(), c1.cend()) == c1.size()); assert(c1.max_load_factor() == 2); - assert(c2.bucket_count() == 0); + LIBCPP_ASSERT(c2.bucket_count() == 0); assert(c2.size() == 0); assert(c2.hash_function() == Hash(1)); assert(c2.key_eq() == Compare(1)); @@ -484,7 +485,7 @@ int main() c2.max_load_factor(2); swap(c1, c2); - assert(c1.bucket_count() == 0); + LIBCPP_ASSERT(c1.bucket_count() == 0); assert(c1.size() == 0); assert(c1.hash_function() == Hash(2)); assert(c1.key_eq() == Compare(2)); |