Get tests running with warnings. Fix warnings in headers and tests

llvm-svn: 228344

3 files changed, 7 insertions, 3 deletions

diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp
index 864d5b5079b..4757422cebb 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp
@@ -47,12 +47,12 @@ void test_default_constructible_extension_sfinae()
         typedef std::tuple<MoveOnly, MoveOnly, NoDefault> Tuple;
 
         static_assert(!std::is_constructible<
-            std::tuple<MoveOnly, MoveOnly, NoDefault>,
+            Tuple,
             std::allocator_arg_t, A1<int>, MoveOnly, MoveOnly
         >::value, "");
 
         static_assert(std::is_constructible<
-            std::tuple<MoveOnly, MoveOnly, NoDefault>,
+            Tuple,
             std::allocator_arg_t, A1<int>, MoveOnly, MoveOnly, NoDefault
         >::value, "");
     }
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.pass.cpp
index fd953f84340..ec40a18fba6 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.pass.cpp
@@ -25,6 +25,7 @@ int main()
         typedef std::tuple<> T;
         T t0;
         T t = t0;
+        ((void)t); // Prevent unused warning
     }
     {
         typedef std::tuple<int> T;
@@ -47,7 +48,7 @@ int main()
         assert(std::get<1>(t) == 'a');
         assert(std::get<2>(t) == "some text");
     }
-#if _LIBCPP_STD_VER > 11 
+#if _LIBCPP_STD_VER > 11
     {
         typedef std::tuple<int> T;
         constexpr T t0(2);
@@ -58,6 +59,8 @@ int main()
         typedef std::tuple<Empty> T;
         constexpr T t0;
         constexpr T t = t0;
+        constexpr Empty e = std::get<0>(t);
+        ((void)e); // Prevent unused warning
     }
 #endif
 }
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp
index 60e6f7e6421..c4f2f110c77 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp
@@ -37,6 +37,7 @@ int main()
         typedef std::tuple<> T;
         T t0;
         T t = std::move(t0);
+        ((void)t); // Prevent unused warning
     }
     {
         typedef std::tuple<MoveOnly> T;