diff options
author | Mehdi Amini <mehdi.amini@apple.com> | 2017-03-02 22:08:42 +0000 |
---|---|---|
committer | Mehdi Amini <mehdi.amini@apple.com> | 2017-03-02 22:08:42 +0000 |
commit | 3df9fd892427238911676a280236efdb10a124fd (patch) | |
tree | 3314bbdb3b8cab989827be5082f31e00db264deb | |
parent | 0cbd39f03a4d10e0d6c58f8fda07ca1dbfb3b0cb (diff) | |
download | external_libcxx-3df9fd892427238911676a280236efdb10a124fd.tar.gz external_libcxx-3df9fd892427238911676a280236efdb10a124fd.tar.bz2 external_libcxx-3df9fd892427238911676a280236efdb10a124fd.zip |
Fix libc++ test experimental/algorithms/alg.random.sample/sample.pass.cpp when ran in c++11 mode 32 bits
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@296830 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | test/std/experimental/algorithms/alg.random.sample/sample.pass.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/test/std/experimental/algorithms/alg.random.sample/sample.pass.cpp b/test/std/experimental/algorithms/alg.random.sample/sample.pass.cpp index 531731791..23098d83e 100644 --- a/test/std/experimental/algorithms/alg.random.sample/sample.pass.cpp +++ b/test/std/experimental/algorithms/alg.random.sample/sample.pass.cpp @@ -58,19 +58,23 @@ void test() { const unsigned os = Expectations::os; SampleItem oa[os]; const int *oa1 = Expectations::oa1; + ((void)oa1); // Prevent unused warning const int *oa2 = Expectations::oa2; + ((void)oa2); // Prevent unused warning std::minstd_rand g; SampleIterator end; end = std::experimental::sample(PopulationIterator(ia), PopulationIterator(ia + is), SampleIterator(oa), os, g); - assert(end.base() - oa == std::min(os, is)); - assert(std::equal(oa, oa + os, oa1)); + assert(static_cast<std::size_t>(end.base() - oa) == std::min(os, is)); + // sample() is deterministic but non-reproducible; + // its results can vary between implementations. + LIBCPP_ASSERT(std::equal(oa, oa + os, oa1)); end = std::experimental::sample(PopulationIterator(ia), PopulationIterator(ia + is), SampleIterator(oa), os, std::move(g)); - assert(end.base() - oa == std::min(os, is)); - assert(std::equal(oa, oa + os, oa2)); + assert(static_cast<std::size_t>(end.base() - oa) == std::min(os, is)); + LIBCPP_ASSERT(std::equal(oa, oa + os, oa2)); } template <template<class...> class PopulationIteratorType, class PopulationItem, @@ -119,7 +123,7 @@ void test_small_population() { end = std::experimental::sample(PopulationIterator(ia), PopulationIterator(ia + is), SampleIterator(oa), os, g); - assert(end.base() - oa == std::min(os, is)); + assert(static_cast<std::size_t>(end.base() - oa) == std::min(os, is)); assert(std::equal(oa, end.base(), oa1)); } |