From 97ecd6491374d756bd9c6da9ef84ab173f5049d6 Mon Sep 17 00:00:00 2001
From: Howard Hinnant <hhinnant@apple.com>
Date: Tue, 17 May 2011 19:12:55 +0000
Subject: [PATCH] Clean up a bunch of warnings in the tests, 3 of which
 actually turned out to be test bugs.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@131479 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/thread/futures/futures.overview/launch.pass.cpp            | 2 +-
 .../futures/futures.tas/futures.task.members/ctor_func.pass.cpp | 2 +-
 .../futures.tas/futures.task.members/ctor_func_alloc.pass.cpp   | 2 +-
 .../template.bitset/bitset.cons/char_ptr_ctor.pass.cpp          | 2 ++
 test/utilities/template.bitset/bitset.cons/default.pass.cpp     | 2 ++
 test/utilities/template.bitset/bitset.cons/string_ctor.pass.cpp | 2 ++
 test/utilities/template.bitset/bitset.cons/ull_ctor.pass.cpp    | 2 ++
 test/utilities/template.bitset/bitset.members/count.pass.cpp    | 2 ++
 test/utilities/template.bitset/bitset.members/flip_all.pass.cpp | 2 ++
 test/utilities/template.bitset/bitset.members/flip_one.pass.cpp | 2 ++
 test/utilities/template.bitset/bitset.members/index.pass.cpp    | 2 ++
 .../template.bitset/bitset.members/index_const.pass.cpp         | 2 ++
 .../template.bitset/bitset.members/left_shift.pass.cpp          | 2 ++
 .../template.bitset/bitset.members/left_shift_eq.pass.cpp       | 2 ++
 test/utilities/template.bitset/bitset.members/not_all.pass.cpp  | 2 ++
 .../utilities/template.bitset/bitset.members/op_and_eq.pass.cpp | 2 ++
 test/utilities/template.bitset/bitset.members/op_eq_eq.pass.cpp | 2 ++
 test/utilities/template.bitset/bitset.members/op_or_eq.pass.cpp | 2 ++
 .../utilities/template.bitset/bitset.members/op_xor_eq.pass.cpp | 2 ++
 .../utilities/template.bitset/bitset.members/reset_all.pass.cpp | 2 ++
 .../template.bitset/bitset.members/right_shift.pass.cpp         | 2 ++
 .../template.bitset/bitset.members/right_shift_eq.pass.cpp      | 2 ++
 test/utilities/template.bitset/bitset.members/set_all.pass.cpp  | 2 ++
 test/utilities/template.bitset/bitset.members/test.pass.cpp     | 2 ++
 .../utilities/template.bitset/bitset.members/to_string.pass.cpp | 2 ++
 test/utilities/template.bitset/bitset.operators/op_and.pass.cpp | 2 ++
 test/utilities/template.bitset/bitset.operators/op_not.pass.cpp | 2 ++
 test/utilities/template.bitset/bitset.operators/op_or.pass.cpp  | 2 ++
 test/utilities/utility/forward/move_only.pass.cpp               | 2 +-
 29 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/test/thread/futures/futures.overview/launch.pass.cpp b/test/thread/futures/futures.overview/launch.pass.cpp
index 63eebe9f2..f4c4ca11c 100644
--- a/test/thread/futures/futures.overview/launch.pass.cpp
+++ b/test/thread/futures/futures.overview/launch.pass.cpp
@@ -20,7 +20,7 @@
 
 int main()
 {
-    static_assert(std::launch::any == std::launch::async | std::launch::deferred, "");
+    static_assert(std::launch::any == (std::launch::async | std::launch::deferred), "");
     static_assert(std::launch::async == 1, "");
     static_assert(std::launch::deferred == 2, "");
 }
diff --git a/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp b/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp
index 8ae592163..7009f306d 100644
--- a/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp
+++ b/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp
@@ -46,7 +46,7 @@ int main()
         assert(A::n_copies == 0);
         assert(A::n_moves > 0);
     }
-    A::n_copies == 0;
+    A::n_copies = 0;
     A::n_copies = 0;
     {
         A a(5);
diff --git a/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp b/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp
index 63042e8c5..2e0cf5d72 100644
--- a/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp
+++ b/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp
@@ -51,7 +51,7 @@ int main()
         assert(A::n_moves > 0);
     }
     assert(test_alloc_base::count == 0);
-    A::n_copies == 0;
+    A::n_copies = 0;
     A::n_copies = 0;
     {
         A a(5);
diff --git a/test/utilities/template.bitset/bitset.cons/char_ptr_ctor.pass.cpp b/test/utilities/template.bitset/bitset.cons/char_ptr_ctor.pass.cpp
index 247e15c74..7fe78bad1 100644
--- a/test/utilities/template.bitset/bitset.cons/char_ptr_ctor.pass.cpp
+++ b/test/utilities/template.bitset/bitset.cons/char_ptr_ctor.pass.cpp
@@ -15,6 +15,8 @@
 #include <bitset>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 void test_char_pointer_ctor()
 {
diff --git a/test/utilities/template.bitset/bitset.cons/default.pass.cpp b/test/utilities/template.bitset/bitset.cons/default.pass.cpp
index 400bc3d38..5d743c6bb 100644
--- a/test/utilities/template.bitset/bitset.cons/default.pass.cpp
+++ b/test/utilities/template.bitset/bitset.cons/default.pass.cpp
@@ -12,6 +12,8 @@
 #include <bitset>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 void test_default_ctor()
 {
diff --git a/test/utilities/template.bitset/bitset.cons/string_ctor.pass.cpp b/test/utilities/template.bitset/bitset.cons/string_ctor.pass.cpp
index 9a7de39f8..bcee50c4c 100644
--- a/test/utilities/template.bitset/bitset.cons/string_ctor.pass.cpp
+++ b/test/utilities/template.bitset/bitset.cons/string_ctor.pass.cpp
@@ -12,6 +12,8 @@
 #include <bitset>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 void test_string_ctor()
 {
diff --git a/test/utilities/template.bitset/bitset.cons/ull_ctor.pass.cpp b/test/utilities/template.bitset/bitset.cons/ull_ctor.pass.cpp
index 5f4a76344..c849937da 100644
--- a/test/utilities/template.bitset/bitset.cons/ull_ctor.pass.cpp
+++ b/test/utilities/template.bitset/bitset.cons/ull_ctor.pass.cpp
@@ -12,6 +12,8 @@
 #include <bitset>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 void test_val_ctor()
 {
diff --git a/test/utilities/template.bitset/bitset.members/count.pass.cpp b/test/utilities/template.bitset/bitset.members/count.pass.cpp
index 1781e9b75..fb9ce6422 100644
--- a/test/utilities/template.bitset/bitset.members/count.pass.cpp
+++ b/test/utilities/template.bitset/bitset.members/count.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/test/utilities/template.bitset/bitset.members/flip_all.pass.cpp b/test/utilities/template.bitset/bitset.members/flip_all.pass.cpp
index 950a06a63..6c4f5c699 100644
--- a/test/utilities/template.bitset/bitset.members/flip_all.pass.cpp
+++ b/test/utilities/template.bitset/bitset.members/flip_all.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/test/utilities/template.bitset/bitset.members/flip_one.pass.cpp b/test/utilities/template.bitset/bitset.members/flip_one.pass.cpp
index 7889dc760..3e09b2020 100644
--- a/test/utilities/template.bitset/bitset.members/flip_one.pass.cpp
+++ b/test/utilities/template.bitset/bitset.members/flip_one.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/test/utilities/template.bitset/bitset.members/index.pass.cpp b/test/utilities/template.bitset/bitset.members/index.pass.cpp
index cc0e0fdc4..b96aaa51a 100644
--- a/test/utilities/template.bitset/bitset.members/index.pass.cpp
+++ b/test/utilities/template.bitset/bitset.members/index.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/test/utilities/template.bitset/bitset.members/index_const.pass.cpp b/test/utilities/template.bitset/bitset.members/index_const.pass.cpp
index c0bb47132..e3c28c693 100644
--- a/test/utilities/template.bitset/bitset.members/index_const.pass.cpp
+++ b/test/utilities/template.bitset/bitset.members/index_const.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/test/utilities/template.bitset/bitset.members/left_shift.pass.cpp b/test/utilities/template.bitset/bitset.members/left_shift.pass.cpp
index 356226019..7fe9fa72e 100644
--- a/test/utilities/template.bitset/bitset.members/left_shift.pass.cpp
+++ b/test/utilities/template.bitset/bitset.members/left_shift.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/test/utilities/template.bitset/bitset.members/left_shift_eq.pass.cpp b/test/utilities/template.bitset/bitset.members/left_shift_eq.pass.cpp
index ddda8bea1..bed3e28ec 100644
--- a/test/utilities/template.bitset/bitset.members/left_shift_eq.pass.cpp
+++ b/test/utilities/template.bitset/bitset.members/left_shift_eq.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/test/utilities/template.bitset/bitset.members/not_all.pass.cpp b/test/utilities/template.bitset/bitset.members/not_all.pass.cpp
index 026ed5606..2f8f7111f 100644
--- a/test/utilities/template.bitset/bitset.members/not_all.pass.cpp
+++ b/test/utilities/template.bitset/bitset.members/not_all.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/test/utilities/template.bitset/bitset.members/op_and_eq.pass.cpp b/test/utilities/template.bitset/bitset.members/op_and_eq.pass.cpp
index 6ef865b7c..b599ec398 100644
--- a/test/utilities/template.bitset/bitset.members/op_and_eq.pass.cpp
+++ b/test/utilities/template.bitset/bitset.members/op_and_eq.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/test/utilities/template.bitset/bitset.members/op_eq_eq.pass.cpp b/test/utilities/template.bitset/bitset.members/op_eq_eq.pass.cpp
index c009da46b..5f6cf3d0a 100644
--- a/test/utilities/template.bitset/bitset.members/op_eq_eq.pass.cpp
+++ b/test/utilities/template.bitset/bitset.members/op_eq_eq.pass.cpp
@@ -16,6 +16,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/test/utilities/template.bitset/bitset.members/op_or_eq.pass.cpp b/test/utilities/template.bitset/bitset.members/op_or_eq.pass.cpp
index c5c946c46..6e6387989 100644
--- a/test/utilities/template.bitset/bitset.members/op_or_eq.pass.cpp
+++ b/test/utilities/template.bitset/bitset.members/op_or_eq.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/test/utilities/template.bitset/bitset.members/op_xor_eq.pass.cpp b/test/utilities/template.bitset/bitset.members/op_xor_eq.pass.cpp
index d1b920a5a..e68a641ca 100644
--- a/test/utilities/template.bitset/bitset.members/op_xor_eq.pass.cpp
+++ b/test/utilities/template.bitset/bitset.members/op_xor_eq.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/test/utilities/template.bitset/bitset.members/reset_all.pass.cpp b/test/utilities/template.bitset/bitset.members/reset_all.pass.cpp
index 611b111f0..ee44d92c4 100644
--- a/test/utilities/template.bitset/bitset.members/reset_all.pass.cpp
+++ b/test/utilities/template.bitset/bitset.members/reset_all.pass.cpp
@@ -12,6 +12,8 @@
 #include <bitset>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 void test_reset_all()
 {
diff --git a/test/utilities/template.bitset/bitset.members/right_shift.pass.cpp b/test/utilities/template.bitset/bitset.members/right_shift.pass.cpp
index 315a7bff2..87fcc281f 100644
--- a/test/utilities/template.bitset/bitset.members/right_shift.pass.cpp
+++ b/test/utilities/template.bitset/bitset.members/right_shift.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/test/utilities/template.bitset/bitset.members/right_shift_eq.pass.cpp b/test/utilities/template.bitset/bitset.members/right_shift_eq.pass.cpp
index c04b7591a..1dd89c184 100644
--- a/test/utilities/template.bitset/bitset.members/right_shift_eq.pass.cpp
+++ b/test/utilities/template.bitset/bitset.members/right_shift_eq.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/test/utilities/template.bitset/bitset.members/set_all.pass.cpp b/test/utilities/template.bitset/bitset.members/set_all.pass.cpp
index 007c7c08f..56454a84f 100644
--- a/test/utilities/template.bitset/bitset.members/set_all.pass.cpp
+++ b/test/utilities/template.bitset/bitset.members/set_all.pass.cpp
@@ -12,6 +12,8 @@
 #include <bitset>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 void test_set_all()
 {
diff --git a/test/utilities/template.bitset/bitset.members/test.pass.cpp b/test/utilities/template.bitset/bitset.members/test.pass.cpp
index 2620c2da5..5102b4617 100644
--- a/test/utilities/template.bitset/bitset.members/test.pass.cpp
+++ b/test/utilities/template.bitset/bitset.members/test.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/test/utilities/template.bitset/bitset.members/to_string.pass.cpp b/test/utilities/template.bitset/bitset.members/to_string.pass.cpp
index a4fc38bd1..b65794097 100644
--- a/test/utilities/template.bitset/bitset.members/to_string.pass.cpp
+++ b/test/utilities/template.bitset/bitset.members/to_string.pass.cpp
@@ -26,6 +26,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/test/utilities/template.bitset/bitset.operators/op_and.pass.cpp b/test/utilities/template.bitset/bitset.operators/op_and.pass.cpp
index 73f0f2aea..751cee691 100644
--- a/test/utilities/template.bitset/bitset.operators/op_and.pass.cpp
+++ b/test/utilities/template.bitset/bitset.operators/op_and.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/test/utilities/template.bitset/bitset.operators/op_not.pass.cpp b/test/utilities/template.bitset/bitset.operators/op_not.pass.cpp
index 3e6133d6a..fda5e5cda 100644
--- a/test/utilities/template.bitset/bitset.operators/op_not.pass.cpp
+++ b/test/utilities/template.bitset/bitset.operators/op_not.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/test/utilities/template.bitset/bitset.operators/op_or.pass.cpp b/test/utilities/template.bitset/bitset.operators/op_or.pass.cpp
index 09d170c67..067f86821 100644
--- a/test/utilities/template.bitset/bitset.operators/op_or.pass.cpp
+++ b/test/utilities/template.bitset/bitset.operators/op_or.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/test/utilities/utility/forward/move_only.pass.cpp b/test/utilities/utility/forward/move_only.pass.cpp
index 2eb023d4a..0588c110f 100644
--- a/test/utilities/utility/forward/move_only.pass.cpp
+++ b/test/utilities/utility/forward/move_only.pass.cpp
@@ -26,7 +26,7 @@ public:
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
     move_only(move_only&&) {}
-    move_only& operator=(move_only&&) {}
+    move_only& operator=(move_only&&) {return *this;}
 #else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
     operator std::__rv<move_only> () {return std::__rv<move_only>(*this);}
     move_only(std::__rv<move_only>) {}