From a3db71902aac604a2ab0622168ae9f28e6bc9281 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Sun, 24 Jul 2016 23:13:36 +0000 Subject: [PATCH] Mark bucket_size() assertions as non-portible. Patch from STL@microsoft.com git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@276578 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../unord/unord.map/bucket_size.pass.cpp | 21 +++++++------- .../unord/unord.multimap/bucket_size.pass.cpp | 29 ++++++++++--------- .../unord/unord.multiset/bucket_size.pass.cpp | 29 ++++++++++--------- .../unord/unord.set/bucket_size.pass.cpp | 21 +++++++------- 4 files changed, 52 insertions(+), 48 deletions(-) diff --git a/test/std/containers/unord/unord.map/bucket_size.pass.cpp b/test/std/containers/unord/unord.map/bucket_size.pass.cpp index 4344508b7..af25de4db 100644 --- a/test/std/containers/unord/unord.map/bucket_size.pass.cpp +++ b/test/std/containers/unord/unord.map/bucket_size.pass.cpp @@ -23,6 +23,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" int main() @@ -41,11 +42,11 @@ int main() }; const C c(std::begin(a), std::end(a)); assert(c.bucket_count() >= 5); - assert(c.bucket_size(0) == 0); - assert(c.bucket_size(1) == 1); - assert(c.bucket_size(2) == 1); - assert(c.bucket_size(3) == 1); - assert(c.bucket_size(4) == 1); + LIBCPP_ASSERT(c.bucket_size(0) == 0); + LIBCPP_ASSERT(c.bucket_size(1) == 1); + LIBCPP_ASSERT(c.bucket_size(2) == 1); + LIBCPP_ASSERT(c.bucket_size(3) == 1); + LIBCPP_ASSERT(c.bucket_size(4) == 1); } #if TEST_STD_VER >= 11 { @@ -63,11 +64,11 @@ int main() }; const C c(std::begin(a), std::end(a)); assert(c.bucket_count() >= 5); - assert(c.bucket_size(0) == 0); - assert(c.bucket_size(1) == 1); - assert(c.bucket_size(2) == 1); - assert(c.bucket_size(3) == 1); - assert(c.bucket_size(4) == 1); + LIBCPP_ASSERT(c.bucket_size(0) == 0); + LIBCPP_ASSERT(c.bucket_size(1) == 1); + LIBCPP_ASSERT(c.bucket_size(2) == 1); + LIBCPP_ASSERT(c.bucket_size(3) == 1); + LIBCPP_ASSERT(c.bucket_size(4) == 1); } #endif #if _LIBCPP_DEBUG_LEVEL >= 1 diff --git a/test/std/containers/unord/unord.multimap/bucket_size.pass.cpp b/test/std/containers/unord/unord.multimap/bucket_size.pass.cpp index 3bc3f5876..30c0e5e3c 100644 --- a/test/std/containers/unord/unord.multimap/bucket_size.pass.cpp +++ b/test/std/containers/unord/unord.multimap/bucket_size.pass.cpp @@ -23,6 +23,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" int main() @@ -41,13 +42,13 @@ int main() }; const C c(std::begin(a), std::end(a)); assert(c.bucket_count() >= 7); - assert(c.bucket_size(0) == 0); - assert(c.bucket_size(1) == 2); - assert(c.bucket_size(2) == 2); - assert(c.bucket_size(3) == 1); - assert(c.bucket_size(4) == 1); - assert(c.bucket_size(5) == 0); - assert(c.bucket_size(6) == 0); + LIBCPP_ASSERT(c.bucket_size(0) == 0); + LIBCPP_ASSERT(c.bucket_size(1) == 2); + LIBCPP_ASSERT(c.bucket_size(2) == 2); + LIBCPP_ASSERT(c.bucket_size(3) == 1); + LIBCPP_ASSERT(c.bucket_size(4) == 1); + LIBCPP_ASSERT(c.bucket_size(5) == 0); + LIBCPP_ASSERT(c.bucket_size(6) == 0); } #if TEST_STD_VER >= 11 { @@ -65,13 +66,13 @@ int main() }; const C c(std::begin(a), std::end(a)); assert(c.bucket_count() >= 7); - assert(c.bucket_size(0) == 0); - assert(c.bucket_size(1) == 2); - assert(c.bucket_size(2) == 2); - assert(c.bucket_size(3) == 1); - assert(c.bucket_size(4) == 1); - assert(c.bucket_size(5) == 0); - assert(c.bucket_size(6) == 0); + LIBCPP_ASSERT(c.bucket_size(0) == 0); + LIBCPP_ASSERT(c.bucket_size(1) == 2); + LIBCPP_ASSERT(c.bucket_size(2) == 2); + LIBCPP_ASSERT(c.bucket_size(3) == 1); + LIBCPP_ASSERT(c.bucket_size(4) == 1); + LIBCPP_ASSERT(c.bucket_size(5) == 0); + LIBCPP_ASSERT(c.bucket_size(6) == 0); } #endif #if _LIBCPP_DEBUG_LEVEL >= 1 diff --git a/test/std/containers/unord/unord.multiset/bucket_size.pass.cpp b/test/std/containers/unord/unord.multiset/bucket_size.pass.cpp index 7ca480556..237b89036 100644 --- a/test/std/containers/unord/unord.multiset/bucket_size.pass.cpp +++ b/test/std/containers/unord/unord.multiset/bucket_size.pass.cpp @@ -22,6 +22,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" int main() @@ -40,13 +41,13 @@ int main() }; const C c(std::begin(a), std::end(a)); assert(c.bucket_count() >= 7); - assert(c.bucket_size(0) == 0); - assert(c.bucket_size(1) == 2); - assert(c.bucket_size(2) == 2); - assert(c.bucket_size(3) == 1); - assert(c.bucket_size(4) == 1); - assert(c.bucket_size(5) == 0); - assert(c.bucket_size(6) == 0); + LIBCPP_ASSERT(c.bucket_size(0) == 0); + LIBCPP_ASSERT(c.bucket_size(1) == 2); + LIBCPP_ASSERT(c.bucket_size(2) == 2); + LIBCPP_ASSERT(c.bucket_size(3) == 1); + LIBCPP_ASSERT(c.bucket_size(4) == 1); + LIBCPP_ASSERT(c.bucket_size(5) == 0); + LIBCPP_ASSERT(c.bucket_size(6) == 0); } #if TEST_STD_VER >= 11 { @@ -64,13 +65,13 @@ int main() }; const C c(std::begin(a), std::end(a)); assert(c.bucket_count() >= 7); - assert(c.bucket_size(0) == 0); - assert(c.bucket_size(1) == 2); - assert(c.bucket_size(2) == 2); - assert(c.bucket_size(3) == 1); - assert(c.bucket_size(4) == 1); - assert(c.bucket_size(5) == 0); - assert(c.bucket_size(6) == 0); + LIBCPP_ASSERT(c.bucket_size(0) == 0); + LIBCPP_ASSERT(c.bucket_size(1) == 2); + LIBCPP_ASSERT(c.bucket_size(2) == 2); + LIBCPP_ASSERT(c.bucket_size(3) == 1); + LIBCPP_ASSERT(c.bucket_size(4) == 1); + LIBCPP_ASSERT(c.bucket_size(5) == 0); + LIBCPP_ASSERT(c.bucket_size(6) == 0); } #endif #if _LIBCPP_DEBUG_LEVEL >= 1 diff --git a/test/std/containers/unord/unord.set/bucket_size.pass.cpp b/test/std/containers/unord/unord.set/bucket_size.pass.cpp index 2ae618c85..10dc099ea 100644 --- a/test/std/containers/unord/unord.set/bucket_size.pass.cpp +++ b/test/std/containers/unord/unord.set/bucket_size.pass.cpp @@ -22,6 +22,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" int main() @@ -40,11 +41,11 @@ int main() }; const C c(std::begin(a), std::end(a)); assert(c.bucket_count() >= 5); - assert(c.bucket_size(0) == 0); - assert(c.bucket_size(1) == 1); - assert(c.bucket_size(2) == 1); - assert(c.bucket_size(3) == 1); - assert(c.bucket_size(4) == 1); + LIBCPP_ASSERT(c.bucket_size(0) == 0); + LIBCPP_ASSERT(c.bucket_size(1) == 1); + LIBCPP_ASSERT(c.bucket_size(2) == 1); + LIBCPP_ASSERT(c.bucket_size(3) == 1); + LIBCPP_ASSERT(c.bucket_size(4) == 1); } #if TEST_STD_VER >= 11 { @@ -61,11 +62,11 @@ int main() }; const C c(std::begin(a), std::end(a)); assert(c.bucket_count() >= 5); - assert(c.bucket_size(0) == 0); - assert(c.bucket_size(1) == 1); - assert(c.bucket_size(2) == 1); - assert(c.bucket_size(3) == 1); - assert(c.bucket_size(4) == 1); + LIBCPP_ASSERT(c.bucket_size(0) == 0); + LIBCPP_ASSERT(c.bucket_size(1) == 1); + LIBCPP_ASSERT(c.bucket_size(2) == 1); + LIBCPP_ASSERT(c.bucket_size(3) == 1); + LIBCPP_ASSERT(c.bucket_size(4) == 1); } #endif #if _LIBCPP_DEBUG_LEVEL >= 1