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

llvm-svn: 228344

5 files changed, 7 insertions, 1 deletions

diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator_types.pass.cpp b/libcxx/test/std/utilities/memory/default.allocator/allocator_types.pass.cpp
index b0282d7b887..db08123a3e5 100644
--- a/libcxx/test/std/utilities/memory/default.allocator/allocator_types.pass.cpp
+++ b/libcxx/test/std/utilities/memory/default.allocator/allocator_types.pass.cpp
@@ -46,4 +46,5 @@ int main()
     std::allocator<char> a2 = a;
     a2 = a;
     std::allocator<int> a3 = a2;
+    ((void)a3);
 }
diff --git a/libcxx/test/std/utilities/memory/ptr.align/align.pass.cpp b/libcxx/test/std/utilities/memory/ptr.align/align.pass.cpp
index e4e2e0ae6a5..d77d13c906d 100644
--- a/libcxx/test/std/utilities/memory/ptr.align/align.pass.cpp
+++ b/libcxx/test/std/utilities/memory/ptr.align/align.pass.cpp
@@ -16,7 +16,6 @@
 
 int main()
 {
-    int i = 0;
     const unsigned N = 20;
     char buf[N];
     void* r;
diff --git a/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/reset1.pass.cpp b/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/reset1.pass.cpp
index 8233ca0e143..195d877bbb7 100644
--- a/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/reset1.pass.cpp
+++ b/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/reset1.pass.cpp
@@ -32,6 +32,7 @@ int main()
     std::unique_ptr<A[]> p(new A[3]);
     assert(A::count == 3);
     A* i = p.get();
+    assert(i != nullptr);
     p.reset();
     assert(A::count == 0);
     assert(p.get() == 0);
@@ -41,6 +42,7 @@ int main()
     std::unique_ptr<A[]> p(new A[4]);
     assert(A::count == 4);
     A* i = p.get();
+    assert(i != nullptr);
     p.reset(new A[5]);
     assert(A::count == 5);
     }
diff --git a/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset1.pass.cpp b/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset1.pass.cpp
index 4041fbb2675..2cf7f8b7756 100644
--- a/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset1.pass.cpp
+++ b/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset1.pass.cpp
@@ -32,6 +32,7 @@ int main()
     std::unique_ptr<A> p(new A);
     assert(A::count == 1);
     A* i = p.get();
+    assert(i != nullptr);
     p.reset();
     assert(A::count == 0);
     assert(p.get() == 0);
@@ -41,6 +42,7 @@ int main()
     std::unique_ptr<A> p(new A);
     assert(A::count == 1);
     A* i = p.get();
+    assert(i != nullptr);
     p.reset(new A);
     assert(A::count == 1);
     }
diff --git a/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset2.pass.cpp b/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset2.pass.cpp
index 6acc3d75063..2de7787b267 100644
--- a/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset2.pass.cpp
+++ b/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset2.pass.cpp
@@ -44,6 +44,7 @@ int main()
     assert(A::count == 1);
     assert(B::count == 0);
     A* i = p.get();
+    assert(i != nullptr);
     p.reset(new B);
     assert(A::count == 1);
     assert(B::count == 1);
@@ -55,6 +56,7 @@ int main()
     assert(A::count == 1);
     assert(B::count == 1);
     A* i = p.get();
+    assert(i != nullptr);
     p.reset(new B);
     assert(A::count == 1);
     assert(B::count == 1);