diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/count.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/count.pass.cpp index 1ce7d5772a3..b57b0980747 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/count.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/count.pass.cpp @@ -57,10 +57,7 @@ int main(int, char**) { test(); test_count<1000>(); // not in constexpr because of constexpr evaluation step limits -// 11.4 added support for constexpr device vars needed here -#if TEST_STD_VER >= 2014 static_assert(test(), ""); -#endif // TEST_STD_VER >= 2014 return 0; } diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/flip_all.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/flip_all.pass.cpp index edab17f9153..9c4e85b5965 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/flip_all.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/flip_all.pass.cpp @@ -53,7 +53,6 @@ int main(int, char**) { test(); test_flip_all<1000>(); // not in constexpr because of constexpr evaluation step limits - // 11.4 added support for constexpr device vars needed here static_assert(test(), ""); return 0; diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/flip_one.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/flip_one.pass.cpp index 4041872f50f..a945d186ab7 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/flip_one.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/flip_one.pass.cpp @@ -56,7 +56,6 @@ int main(int, char**) { test(); test_flip_one<1000>(); // not in constexpr because of constexpr evaluation step limits - // 11.4 added support for constexpr device vars needed here static_assert(test(), ""); return 0; diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/index.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/index.pass.cpp index 58418ced818..2b619a54004 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/index.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/index.pass.cpp @@ -72,7 +72,6 @@ int main(int, char**) { test(); test_index<1000>(); // not in constexpr because of constexpr evaluation step limits - // 11.4 added support for constexpr device vars needed here static_assert(test(), ""); return 0; diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/index_const.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/index_const.pass.cpp index 50478bc2f8a..9debde37fb7 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/index_const.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/index_const.pass.cpp @@ -63,7 +63,6 @@ int main(int, char**) { test(); test_index_const<1000>(); // not in constexpr because of constexpr evaluation step limits - // 11.4 added support for constexpr device vars needed here static_assert(test(), ""); return 0; diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/left_shift.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/left_shift.pass.cpp index 04730314e23..b4a5eaa490d 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/left_shift.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/left_shift.pass.cpp @@ -50,7 +50,6 @@ int main(int, char**) test_left_shift<64>(); test_left_shift<65>(); test_left_shift<1000>(); // not in constexpr because of constexpr evaluation step limits - // 11.4 added support for constexpr device vars needed here static_assert(test_left_shift<0>(), ""); static_assert(test_left_shift<1>(), ""); static_assert(test_left_shift<31>(), ""); diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/left_shift_eq.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/left_shift_eq.pass.cpp index 9619a8a3d4f..8b3b67a460d 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/left_shift_eq.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/left_shift_eq.pass.cpp @@ -61,7 +61,6 @@ int main(int, char**) test_left_shift<64>(); test_left_shift<65>(); test_left_shift<1000>(); // not in constexpr because of constexpr evaluation step limits - // 11.4 added support for constexpr device vars needed here static_assert(test_left_shift<0>(), ""); static_assert(test_left_shift<1>(), ""); static_assert(test_left_shift<31>(), ""); diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/not_all.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/not_all.pass.cpp index 605a65e6b8b..33ecc125143 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/not_all.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/not_all.pass.cpp @@ -52,7 +52,6 @@ int main(int, char**) { test(); test_not_all<1000>(); // not in constexpr because of constexpr evaluation step limits - // 11.4 added support for constexpr device vars needed here static_assert(test(), ""); return 0; diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/op_and_eq.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/op_and_eq.pass.cpp index 0b65c4f53f4..27fa3d8f8f6 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/op_and_eq.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/op_and_eq.pass.cpp @@ -52,7 +52,6 @@ int main(int, char**) test_op_and_eq<64>(); test_op_and_eq<65>(); test_op_and_eq<1000>(); // not in constexpr because of constexpr evaluation step limits - // 11.4 added support for constexpr device vars needed here static_assert(test_op_and_eq<0>(), ""); static_assert(test_op_and_eq<1>(), ""); static_assert(test_op_and_eq<31>(), ""); diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/op_eq_eq.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/op_eq_eq.pass.cpp index f6e695fdd60..67339f0ab38 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/op_eq_eq.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/op_eq_eq.pass.cpp @@ -53,7 +53,6 @@ int main(int, char**) { test(); test_equality<1000>(); // not in constexpr because of constexpr evaluation step limits - // 11.4 added support for constexpr device vars needed here static_assert(test(), ""); return 0; diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/op_or_eq.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/op_or_eq.pass.cpp index 2c8755cc2ec..76ef3294cdd 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/op_or_eq.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/op_or_eq.pass.cpp @@ -58,7 +58,6 @@ int main(int, char**) test_op_or_eq<64>(); test_op_or_eq<65>(); test_op_or_eq<1000>(); // not in constexpr because of constexpr evaluation step limits - // 11.4 added support for constexpr device vars needed here static_assert(test_op_or_eq<0>(), ""); static_assert(test_op_or_eq<1>(), ""); static_assert(test_op_or_eq<31>(), ""); diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/op_xor_eq.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/op_xor_eq.pass.cpp index 67c5de1fac6..4651314a5ec 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/op_xor_eq.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/op_xor_eq.pass.cpp @@ -55,7 +55,6 @@ int main(int, char**) test_op_xor_eq<64>(); test_op_xor_eq<65>(); test_op_xor_eq<1000>(); // not in constexpr because of constexpr evaluation step limits - // 11.4 added support for constexpr device vars needed here static_assert(test_op_xor_eq<0>(), ""); static_assert(test_op_xor_eq<1>(), ""); static_assert(test_op_xor_eq<31>(), ""); diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/reset_one.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/reset_one.pass.cpp index 80e849a39a5..b386538efbc 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/reset_one.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/reset_one.pass.cpp @@ -52,7 +52,6 @@ int main(int, char**) test_reset_one<64>(); test_reset_one<65>(); test_reset_one<1000>(); // not in constexpr because of constexpr evaluation step limits - // 11.4 added support for constexpr device vars needed here static_assert(test_reset_one<0>(), ""); static_assert(test_reset_one<1>(), ""); static_assert(test_reset_one<31>(), ""); diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/right_shift.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/right_shift.pass.cpp index 4ecd632bee8..3902aed4b1a 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/right_shift.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/right_shift.pass.cpp @@ -48,7 +48,6 @@ __host__ __device__ int main(int, char**) test_right_shift<64>(); test_right_shift<65>(); test_right_shift<1000>(); // not in constexpr because of constexpr evaluation step limits - // 11.4 added support for constexpr device vars needed here static_assert(test_right_shift<0>(), ""); static_assert(test_right_shift<1>(), ""); static_assert(test_right_shift<31>(), ""); diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/right_shift_eq.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/right_shift_eq.pass.cpp index aa8ffd23c43..509b359ca78 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/right_shift_eq.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/right_shift_eq.pass.cpp @@ -63,7 +63,6 @@ __host__ __device__ int main(int, char**) test_right_shift<64>(); test_right_shift<65>(); test_right_shift<1000>(); // not in constexpr because of constexpr evaluation step limits - // 11.4 added support for constexpr device vars needed here static_assert(test_right_shift<0>(), ""); static_assert(test_right_shift<1>(), ""); static_assert(test_right_shift<31>(), ""); diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/set_one.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/set_one.pass.cpp index 6d2118562e6..d61c561f6d7 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/set_one.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/set_one.pass.cpp @@ -51,7 +51,6 @@ int main(int, char**) { test(); test_set_one<1000>(); // not in constexpr because of constexpr evaluation step limits - // 11.4 added support for constexpr device vars needed here static_assert(test(), ""); return 0; diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/test.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/test.pass.cpp index 5b32f3f3486..8c09e1e3658 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/test.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/test.pass.cpp @@ -51,7 +51,6 @@ int main(int, char**) { test(); test_test<1000>(); // not in constexpr because of constexpr evaluation step limits - // 11.4 added support for constexpr device vars needed here static_assert(test(), ""); return 0; diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/to_ullong.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/to_ullong.pass.cpp index 316cbf66755..896d58efc77 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/to_ullong.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/to_ullong.pass.cpp @@ -67,9 +67,6 @@ __host__ __device__ TEST_CONSTEXPR_CXX14 bool test() int main(int, char**) { test(); -#if !_CCCL_COMPILER(MSVC) static_assert(test(), ""); -#endif // TEST_STD_VER >= 2014 - return 0; } diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/to_ulong.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/to_ulong.pass.cpp index afa4bb80444..f4f8b0fab4e 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/to_ulong.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.members/to_ulong.pass.cpp @@ -66,9 +66,7 @@ __host__ __device__ TEST_CONSTEXPR_CXX14 bool test() int main(int, char**) { test(); -#if !_CCCL_COMPILER(MSVC) static_assert(test(), ""); -#endif return 0; } diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.operators/op_and.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.operators/op_and.pass.cpp index 32b087f0d80..c920f55631f 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.operators/op_and.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.operators/op_and.pass.cpp @@ -44,7 +44,6 @@ int main(int, char**) test_op_and<64>(); test_op_and<65>(); test_op_and<1000>(); // not in constexpr because of constexpr evaluation step limits - // 11.4 added support for constexpr device vars needed here static_assert(test_op_and<0>(), ""); static_assert(test_op_and<1>(), ""); static_assert(test_op_and<31>(), ""); diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.operators/op_not.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.operators/op_not.pass.cpp index ef7af1a5f47..6a96fe9d34d 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.operators/op_not.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.operators/op_not.pass.cpp @@ -44,7 +44,6 @@ int main(int, char**) test_op_not<64>(); test_op_not<65>(); test_op_not<1000>(); // not in constexpr because of constexpr evaluation step limits - // 11.4 added support for constexpr device vars needed here static_assert(test_op_not<0>(), ""); static_assert(test_op_not<1>(), ""); static_assert(test_op_not<31>(), ""); diff --git a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.operators/op_or.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.operators/op_or.pass.cpp index 525d201698e..f4937da5669 100644 --- a/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.operators/op_or.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/utilities/template.bitset/bitset.operators/op_or.pass.cpp @@ -44,7 +44,6 @@ int main(int, char**) test_op_or<64>(); test_op_or<65>(); test_op_or<1000>(); // not in constexpr because of constexpr evaluation step limits - // 11.4 added support for constexpr device vars needed here static_assert(test_op_or<0>(), ""); static_assert(test_op_or<1>(), ""); static_assert(test_op_or<31>(), "");