From 68a694b800a9bb5f5cbbc5d8c956a87273356d20 Mon Sep 17 00:00:00 2001
From: "Stephan T. Lavavej" <stl@exchange.microsoft.com>
Date: Tue, 6 Dec 2016 01:13:14 +0000
Subject: [libcxx] [test] D27022: Fix MSVC warning C4389 "signed/unsigned
 mismatch", part 9/12.

Add static_cast<std::size_t> to more comparisons. (Performed manually, unlike part 8/12.)

Also, include <cstddef> when it wasn't already being included.

llvm-svn: 288746
---
 .../alg.modifying.operations/alg.random.sample/sample.pass.cpp     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.pass.cpp')

diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.pass.cpp
index 0cb00e3670e..0a14c6695b0 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.pass.cpp
@@ -21,6 +21,7 @@
 #include <random>
 #include <type_traits>
 #include <cassert>
+#include <cstddef>
 
 #include "test_iterators.h"
 #include "test_macros.h"
@@ -70,14 +71,14 @@ void test() {
   end = std::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));
   // sample() is deterministic but non-reproducible;
   // its results can vary between implementations.
   LIBCPP_ASSERT(std::equal(oa, oa + os, oa1));
   end = std::sample(PopulationIterator(ia),
                                   PopulationIterator(ia + is),
                                   SampleIterator(oa), os, std::move(g));
-  assert(end.base() - oa == std::min(os, is));
+  assert(static_cast<std::size_t>(end.base() - oa) == std::min(os, is));
   LIBCPP_ASSERT(std::equal(oa, oa + os, oa2));
 }
 
@@ -127,7 +128,7 @@ void test_small_population() {
   end = std::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));
   typedef typename std::iterator_traits<PopulationIterator>::iterator_category PopulationCategory;
   if (std::is_base_of<std::forward_iterator_tag, PopulationCategory>::value) {
     assert(std::equal(oa, end.base(), oa1));
-- 
cgit v1.2.3