STL_MSFT created this revision.
STL_MSFT added reviewers: EricWF, mclow.lists.
STL_MSFT added a subscriber: cfe-commits.
Mark bucket_size() assertions as nonportable.
Even if you control the hash, the Standard doesn't guarantee what the bucket
population sizes will be. All of these assertions are nonportable and should be
marked accordingly.
http://reviews.llvm.org/D22159
Files:
test/std/containers/unord/unord.map/bucket_size.pass.cpp
test/std/containers/unord/unord.multimap/bucket_size.pass.cpp
test/std/containers/unord/unord.multiset/bucket_size.pass.cpp
test/std/containers/unord/unord.set/bucket_size.pass.cpp
Index: test/std/containers/unord/unord.set/bucket_size.pass.cpp
===================================================================
--- test/std/containers/unord/unord.set/bucket_size.pass.cpp
+++ test/std/containers/unord/unord.set/bucket_size.pass.cpp
@@ -22,6 +22,7 @@
#include <unordered_set>
#include <cassert>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -40,11 +41,11 @@
};
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 @@
};
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
Index: test/std/containers/unord/unord.multiset/bucket_size.pass.cpp
===================================================================
--- test/std/containers/unord/unord.multiset/bucket_size.pass.cpp
+++ test/std/containers/unord/unord.multiset/bucket_size.pass.cpp
@@ -22,6 +22,7 @@
#include <unordered_set>
#include <cassert>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -40,13 +41,13 @@
};
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 @@
};
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
Index: test/std/containers/unord/unord.multimap/bucket_size.pass.cpp
===================================================================
--- test/std/containers/unord/unord.multimap/bucket_size.pass.cpp
+++ test/std/containers/unord/unord.multimap/bucket_size.pass.cpp
@@ -23,6 +23,7 @@
#include <string>
#include <cassert>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -41,13 +42,13 @@
};
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 @@
};
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
Index: test/std/containers/unord/unord.map/bucket_size.pass.cpp
===================================================================
--- test/std/containers/unord/unord.map/bucket_size.pass.cpp
+++ test/std/containers/unord/unord.map/bucket_size.pass.cpp
@@ -23,6 +23,7 @@
#include <string>
#include <cassert>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -41,11 +42,11 @@
};
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 @@
};
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
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
