Fix unused variables in tests to placate scan-build. Patch from Steve MacKenzie.

llvm-svn: 220154

diff --git a/libcxx/test/atomics/atomics.types.generic/bool.pass.cpp b/libcxx/test/atomics/atomics.types.generic/bool.pass.cpp
index 500a2a2..dd851e8 100644 (file)
--- a/libcxx/test/atomics/atomics.types.generic/bool.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.generic/bool.pass.cpp
@@ -68,6 +68,7 @@ int main()
         std::atomic_init(&obj, true);
         assert(obj == true);
         bool b0 = obj.is_lock_free();
+        (void)b0; // to placate scan-build
         obj.store(false);
         assert(obj == false);
         obj.store(true, std::memory_order_release);
@@ -123,6 +124,7 @@ int main()
         std::atomic_init(&obj, true);
         assert(obj == true);
         bool b0 = obj.is_lock_free();
+        (void)b0; // to placate scan-build
         obj.store(false);
         assert(obj == false);
         obj.store(true, std::memory_order_release);
@@ -178,6 +180,7 @@ int main()
         std::atomic_init(&obj, true);
         assert(obj == true);
         bool b0 = obj.is_lock_free();
+        (void)b0; // to placate scan-build
         obj.store(false);
         assert(obj == false);
         obj.store(true, std::memory_order_release);

diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp
index ebae10e..33821d3 100644 (file)
--- a/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp
@@ -71,6 +71,7 @@ int main()
         assert(next(m.begin(), 5)->second == 2);
 
         i = m.erase(3);
+        assert(i == 3);
         assert(m.size() == 3);
         assert(next(m.begin(), 0)->first == 1);
         assert(next(m.begin(), 0)->second == 1);
@@ -135,6 +136,7 @@ int main()
         assert(next(m.begin(), 5)->second == 2);
 
         i = m.erase(3);
+        assert(i == 3);
         assert(m.size() == 3);
         assert(next(m.begin(), 0)->first == 1);
         assert(next(m.begin(), 0)->second == 1);

diff --git a/libcxx/test/containers/sequences/array/array.data/data.pass.cpp b/libcxx/test/containers/sequences/array/array.data/data.pass.cpp
index ea91357..08e4fd3 100644 (file)
--- a/libcxx/test/containers/sequences/array/array.data/data.pass.cpp
+++ b/libcxx/test/containers/sequences/array/array.data/data.pass.cpp
@@ -30,5 +30,6 @@ int main()
         typedef std::array<T, 0> C;
         C c = {};
         T* p = c.data();
+        (void)p; // to placate scan-build
     }
 }

diff --git a/libcxx/test/containers/sequences/array/array.data/data_const.pass.cpp b/libcxx/test/containers/sequences/array/array.data/data_const.pass.cpp
index 93acb71..8eb9762 100644 (file)
--- a/libcxx/test/containers/sequences/array/array.data/data_const.pass.cpp
+++ b/libcxx/test/containers/sequences/array/array.data/data_const.pass.cpp
@@ -30,5 +30,6 @@ int main()
         typedef std::array<T, 0> C;
         const C c = {};
         const T* p = c.data();
+        (void)p; // to placate scan-build
     }
 }

diff --git a/libcxx/test/depr/depr.c.headers/tgmath_h.pass.cpp b/libcxx/test/depr/depr.c.headers/tgmath_h.pass.cpp
index c4c9e85..a2ef814 100644 (file)
--- a/libcxx/test/depr/depr.c.headers/tgmath_h.pass.cpp
+++ b/libcxx/test/depr/depr.c.headers/tgmath_h.pass.cpp
@@ -19,4 +19,5 @@ int main()
 {
     std::complex<double> cd;
     double x = sin(1.0);
+    (void)x; // to placate scan-build
 }