From e028cd8af86f45139f6a7baaa1a384b126dd041e Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Sun, 24 Jul 2016 23:16:37 +0000 Subject: [PATCH] Make bucket_count() greater-equal assertions portable. Patch from STL@microsoft.com llvm-svn: 276580 --- libcxx/test/std/containers/unord/unord.map/bucket_count.pass.cpp | 4 ++-- libcxx/test/std/containers/unord/unord.multimap/bucket_count.pass.cpp | 2 +- libcxx/test/std/containers/unord/unord.multiset/bucket_count.pass.cpp | 4 ++-- libcxx/test/std/containers/unord/unord.set/bucket_count.pass.cpp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libcxx/test/std/containers/unord/unord.map/bucket_count.pass.cpp b/libcxx/test/std/containers/unord/unord.map/bucket_count.pass.cpp index bc37337..a6d48ad 100644 --- a/libcxx/test/std/containers/unord/unord.map/bucket_count.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.map/bucket_count.pass.cpp @@ -44,7 +44,7 @@ int main() P(80, "eighty"), }; const C c(std::begin(a), std::end(a)); - assert(c.bucket_count() >= 11); + assert(c.bucket_count() >= 8); } #if TEST_STD_VER >= 11 { @@ -69,7 +69,7 @@ int main() P(80, "eighty"), }; const C c(std::begin(a), std::end(a)); - assert(c.bucket_count() >= 11); + assert(c.bucket_count() >= 8); } #endif } diff --git a/libcxx/test/std/containers/unord/unord.multimap/bucket_count.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/bucket_count.pass.cpp index d44412f..9e04438 100644 --- a/libcxx/test/std/containers/unord/unord.multimap/bucket_count.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multimap/bucket_count.pass.cpp @@ -44,6 +44,6 @@ int main() P(80, "eighty"), }; const C c(std::begin(a), std::end(a)); - assert(c.bucket_count() >= 11); + assert(c.bucket_count() >= 8); } } diff --git a/libcxx/test/std/containers/unord/unord.multiset/bucket_count.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/bucket_count.pass.cpp index adde647..cdab8a4 100644 --- a/libcxx/test/std/containers/unord/unord.multiset/bucket_count.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multiset/bucket_count.pass.cpp @@ -45,7 +45,7 @@ int main() P(80) }; const C c(std::begin(a), std::end(a)); - assert(c.bucket_count() >= 11); + assert(c.bucket_count() >= 8); } #if TEST_STD_VER >= 11 { @@ -73,7 +73,7 @@ int main() P(80) }; const C c(std::begin(a), std::end(a)); - assert(c.bucket_count() >= 11); + assert(c.bucket_count() >= 8); } #endif } diff --git a/libcxx/test/std/containers/unord/unord.set/bucket_count.pass.cpp b/libcxx/test/std/containers/unord/unord.set/bucket_count.pass.cpp index e35e436..05d8a7d 100644 --- a/libcxx/test/std/containers/unord/unord.set/bucket_count.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.set/bucket_count.pass.cpp @@ -45,7 +45,7 @@ int main() P(80) }; const C c(std::begin(a), std::end(a)); - assert(c.bucket_count() >= 11); + assert(c.bucket_count() >= 8); } #if TEST_STD_VER >= 11 { @@ -71,7 +71,7 @@ int main() P(80) }; const C c(std::begin(a), std::end(a)); - assert(c.bucket_count() >= 11); + assert(c.bucket_count() >= 8); } #endif } -- 2.7.4