[libcxx-commits] [libcxx] f92d874 - [libc++][test] Silence MSVC "comparison of signed and unsigned" warning

[Casey Carter via libcxx-commits]

Author: Casey Carter
Date: 2020-10-19T17:18:44-07:00
New Revision: f92d874fe58555c1e6982cf78c257f3188d429f9

URL: https://github.com/llvm/llvm-project/commit/f92d874fe58555c1e6982cf78c257f3188d429f9
DIFF: https://github.com/llvm/llvm-project/commit/f92d874fe58555c1e6982cf78c257f3188d429f9.diff

LOG: [libc++][test] Silence MSVC "comparison of signed and unsigned" warning

Added: 
    

Modified: 
    libcxx/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp
    libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp

Removed: 
    


################################################################################
diff  --git a/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp
index 8730ecdbd572..5e8e998c8703 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp
@@ -37,7 +37,7 @@ TEST_CONSTEXPR bool test_constexpr() {
 
   auto it = std::merge(std::begin(ia), std::end(ia), std::begin(ib),
                        std::end(ib), std::begin(ic));
-  assert(std::distance(std::begin(ic), it) == (std::size(ia) + std::size(ib)));
+  assert(std::distance(std::begin(ic), it) == static_cast<int>(std::size(ia) + std::size(ib)));
   assert(*it == 0);
   assert(std::equal(std::begin(ic), it, std::begin(expected), std::end(expected)));
   return true;

diff  --git a/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
index b15a6ff4e21a..63fe392f19ba 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
@@ -42,7 +42,7 @@ TEST_CONSTEXPR bool test_constexpr() {
   auto it =
       std::merge(std::begin(ia), std::end(ia), std::begin(ib), std::end(ib),
                  std::begin(ic), std::less<>{});
-  assert(std::distance(std::begin(ic), it) == (std::size(ia) + std::size(ib)));
+  assert(std::distance(std::begin(ic), it) == static_cast<int>(std::size(ia) + std::size(ib)));
   assert(*it == 0);
   assert(
       std::equal(std::begin(ic), it, std::begin(expected), std::end(expected)));