Mark bucket() assertions as non-portable. Patch from STL@microsoft.com

llvm-svn: 276584

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 1abb580..8931fdf 100644 (file)
--- 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 415dce1..425c63f 100644 (file)
--- 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 30858c7..b0fb9b3 100644 (file)
--- 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 9b704cc..3903d96 100644 (file)
--- 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