diff options
| author | Eric Fiselier <eric@efcs.ca> | 2016-07-24 23:34:18 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2016-07-24 23:34:18 +0000 |
| commit | 307e4216b26dceebbfbf3451a3c1c020274928af (patch) | |
| tree | d90212ff04054867c2b5a78b09d6190bfe410dd5 | |
| parent | 1b3eb43252c5ae1a4a4c3411de584cfc183f3a2b (diff) | |
| download | bcm5719-llvm-307e4216b26dceebbfbf3451a3c1c020274928af.tar.gz bcm5719-llvm-307e4216b26dceebbfbf3451a3c1c020274928af.zip | |
Mark bucket() assertions as non-portable. Patch from STL@microsoft.com
llvm-svn: 276584
4 files changed, 12 insertions, 8 deletions
diff --git a/libcxx/test/std/containers/unord/unord.map/bucket.pass.cpp b/libcxx/test/std/containers/unord/unord.map/bucket.pass.cpp index 1abb58070af..8931fdf642f 100644 --- a/libcxx/test/std/containers/unord/unord.map/bucket.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.map/bucket.pass.cpp @@ -23,6 +23,7 @@ #include <string> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" int main() @@ -43,7 +44,7 @@ int main() size_t bc = c.bucket_count(); assert(bc >= 5); for (size_t i = 0; i < 13; ++i) - assert(c.bucket(i) == i % bc); + LIBCPP_ASSERT(c.bucket(i) == i % bc); } #if TEST_STD_VER >= 11 { @@ -63,7 +64,7 @@ int main() size_t bc = c.bucket_count(); assert(bc >= 5); for (size_t i = 0; i < 13; ++i) - assert(c.bucket(i) == i % bc); + LIBCPP_ASSERT(c.bucket(i) == i % bc); } #endif #if _LIBCPP_DEBUG_LEVEL >= 1 diff --git a/libcxx/test/std/containers/unord/unord.multimap/bucket.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/bucket.pass.cpp index 415dce11c12..425c63f9df0 100644 --- a/libcxx/test/std/containers/unord/unord.multimap/bucket.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multimap/bucket.pass.cpp @@ -23,6 +23,7 @@ #include <string> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" int main() @@ -43,7 +44,7 @@ int main() size_t bc = c.bucket_count(); assert(bc >= 7); for (size_t i = 0; i < 13; ++i) - assert(c.bucket(i) == i % bc); + LIBCPP_ASSERT(c.bucket(i) == i % bc); } #if TEST_STD_VER >= 11 { @@ -63,7 +64,7 @@ int main() size_t bc = c.bucket_count(); assert(bc >= 7); for (size_t i = 0; i < 13; ++i) - assert(c.bucket(i) == i % bc); + LIBCPP_ASSERT(c.bucket(i) == i % bc); } #endif #if _LIBCPP_DEBUG_LEVEL >= 1 diff --git a/libcxx/test/std/containers/unord/unord.multiset/bucket.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/bucket.pass.cpp index 30858c79a04..b0fb9b334cc 100644 --- a/libcxx/test/std/containers/unord/unord.multiset/bucket.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multiset/bucket.pass.cpp @@ -22,6 +22,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" int main() @@ -42,7 +43,7 @@ int main() size_t bc = c.bucket_count(); assert(bc >= 7); for (size_t i = 0; i < 13; ++i) - assert(c.bucket(i) == i % bc); + LIBCPP_ASSERT(c.bucket(i) == i % bc); } #if TEST_STD_VER >= 11 { @@ -62,7 +63,7 @@ int main() size_t bc = c.bucket_count(); assert(bc >= 7); for (size_t i = 0; i < 13; ++i) - assert(c.bucket(i) == i % bc); + LIBCPP_ASSERT(c.bucket(i) == i % bc); } #endif #if _LIBCPP_DEBUG_LEVEL >= 1 diff --git a/libcxx/test/std/containers/unord/unord.set/bucket.pass.cpp b/libcxx/test/std/containers/unord/unord.set/bucket.pass.cpp index 9b704ccee0c..3903d96c196 100644 --- a/libcxx/test/std/containers/unord/unord.set/bucket.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.set/bucket.pass.cpp @@ -22,6 +22,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" int main() @@ -42,7 +43,7 @@ int main() size_t bc = c.bucket_count(); assert(bc >= 5); for (size_t i = 0; i < 13; ++i) - assert(c.bucket(i) == i % bc); + LIBCPP_ASSERT(c.bucket(i) == i % bc); } #if TEST_STD_VER >= 11 { @@ -61,7 +62,7 @@ int main() size_t bc = c.bucket_count(); assert(bc >= 5); for (size_t i = 0; i < 13; ++i) - assert(c.bucket(i) == i % bc); + LIBCPP_ASSERT(c.bucket(i) == i % bc); } #endif #if _LIBCPP_DEBUG_LEVEL >= 1 |
