1 files changed, 9 insertions, 12 deletions
diff --git a/test/std/numerics/numarray/valarray.nonmembers/valarray.special/swap.pass.cpp b/test/std/numerics/numarray/valarray.nonmembers/valarray.special/swap.pass.cpp
index 84f73945c401..cb1807bf3809 100644
--- a/test/std/numerics/numarray/valarray.nonmembers/valarray.special/swap.pass.cpp
+++ b/test/std/numerics/numarray/valarray.nonmembers/valarray.special/swap.pass.cpp
@@ -17,6 +17,7 @@
 
 #include <valarray>
 #include <cassert>
+#include <cstddef>
 
 int main()
 {
@@ -32,33 +33,31 @@ int main()
         std::valarray<T> v2_save = v2;
         swap(v1, v2);
         assert(v1.size() == v2_save.size());
-        for (int i = 0; i < v1.size(); ++i)
+        for (std::size_t i = 0; i < v1.size(); ++i)
             assert(v1[i] == v2_save[i]);
         assert(v2.size() == v1_save.size());
-        for (int i = 0; i < v2.size(); ++i)
+        for (std::size_t i = 0; i < v2.size(); ++i)
             assert(v2[i] == v1_save[i]);
     }
     {
         typedef int T;
         T a1[] = {1, 2, 3, 4, 5};
         const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        const unsigned N2 = 0;
         std::valarray<T> v1(a1, N1);
         std::valarray<T> v2;
         std::valarray<T> v1_save = v1;
         std::valarray<T> v2_save = v2;
         swap(v1, v2);
         assert(v1.size() == v2_save.size());
-        for (int i = 0; i < v1.size(); ++i)
+        for (std::size_t i = 0; i < v1.size(); ++i)
             assert(v1[i] == v2_save[i]);
         assert(v2.size() == v1_save.size());
-        for (int i = 0; i < v2.size(); ++i)
+        for (std::size_t i = 0; i < v2.size(); ++i)
             assert(v2[i] == v1_save[i]);
     }
     {
         typedef int T;
         T a2[] = {6, 7, 8, 9, 10, 11, 12};
-        const unsigned N1 = 0;
         const unsigned N2 = sizeof(a2)/sizeof(a2[0]);
         std::valarray<T> v1;
         std::valarray<T> v2(a2, N2);
@@ -66,26 +65,24 @@ int main()
         std::valarray<T> v2_save = v2;
         swap(v1, v2);
         assert(v1.size() == v2_save.size());
-        for (int i = 0; i < v1.size(); ++i)
+        for (std::size_t i = 0; i < v1.size(); ++i)
             assert(v1[i] == v2_save[i]);
         assert(v2.size() == v1_save.size());
-        for (int i = 0; i < v2.size(); ++i)
+        for (std::size_t i = 0; i < v2.size(); ++i)
             assert(v2[i] == v1_save[i]);
     }
     {
         typedef int T;
-        const unsigned N1 = 0;
-        const unsigned N2 = 0;
         std::valarray<T> v1;
         std::valarray<T> v2;
         std::valarray<T> v1_save = v1;
         std::valarray<T> v2_save = v2;
         swap(v1, v2);
         assert(v1.size() == v2_save.size());
-        for (int i = 0; i < v1.size(); ++i)
+        for (std::size_t i = 0; i < v1.size(); ++i)
             assert(v1[i] == v2_save[i]);
         assert(v2.size() == v1_save.size());
-        for (int i = 0; i < v2.size(); ++i)
+        for (std::size_t i = 0; i < v2.size(); ++i)
             assert(v2[i] == v1_save[i]);
     }
 }