Apply constexpr to <bitset>.

llvm-svn: 159899

3 files changed, 5 insertions, 2 deletions

diff --git a/libcxx/test/utilities/template.bitset/bitset.cons/default.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.cons/default.pass.cpp
index 5d743c6bb63..bd5ca7e08b2 100644
--- a/libcxx/test/utilities/template.bitset/bitset.cons/default.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.cons/default.pass.cpp
@@ -18,7 +18,7 @@ template <std::size_t N>
 void test_default_ctor()
 {
     {
-    std::bitset<N> v1;
+    _LIBCPP_CONSTEXPR std::bitset<N> v1;
     assert(v1.size() == N);
     for (std::size_t i = 0; i < N; ++i)
         assert(v1[i] == false);
diff --git a/libcxx/test/utilities/template.bitset/bitset.cons/ull_ctor.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.cons/ull_ctor.pass.cpp
index c849937dae5..023fedc2583 100644
--- a/libcxx/test/utilities/template.bitset/bitset.cons/ull_ctor.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.cons/ull_ctor.pass.cpp
@@ -18,7 +18,7 @@ template <std::size_t N>
 void test_val_ctor()
 {
     {
-    std::bitset<N> v(0xAAAAAAAAAAAAAAAAULL);
+    _LIBCPP_CONSTEXPR std::bitset<N> v(0xAAAAAAAAAAAAAAAAULL);
     assert(v.size() == N);
     unsigned M = std::min<std::size_t>(N, 64);
     for (std::size_t i = 0; i < M; ++i)
diff --git a/libcxx/test/utilities/template.bitset/bitset.members/reset_one.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.members/reset_one.pass.cpp
index 2b9b097f90a..ebaa9e7a8d7 100644
--- a/libcxx/test/utilities/template.bitset/bitset.members/reset_one.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.members/reset_one.pass.cpp
@@ -12,6 +12,9 @@
 #include <bitset>
 #include <cassert>
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 void test_reset_one()
 {