Skip to content

Commit

Permalink
Cleanup NVCC version filtering
Browse files Browse the repository at this point in the history
  • Loading branch information
@miscco
miscco committed Jun 27, 2023
1 parent b92504b commit 3a4927a
Show file tree
Hide file tree
Showing 71 changed files with 213 additions and 196 deletions.
4 changes: 2 additions & 2 deletions ...dacxx/.upstream-tests/test/std/containers/views/mdspan/mdspan.extents.cons/array.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ int main(int, char**)

static_assert( is_array_cons_avail_v< cuda::std::dextents< int,2>, my_int, 2 > == true , "" );

#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000)
#if !defined(TEST_COMPILER_NVCC_BELOW_11_3)
// Constraint: rank consistency
static_assert( is_array_cons_avail_v< cuda::std::dextents< int,1>, int , 2 > == false, "" );

Expand All @@ -66,7 +66,7 @@ int main(int, char**)
#ifndef TEST_COMPILER_NVHPC
static_assert( is_array_cons_avail_v< cuda::std::dextents< int,1>, my_int_non_nothrow_constructible, 1 > == false, "" );
#endif // TEST_COMPILER_NVHPC
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000)
#endif // !defined(TEST_COMPILER_NVCC_BELOW_11_3)

return 0;
}
4 changes: 2 additions & 2 deletions ...udacxx/.upstream-tests/test/std/containers/views/mdspan/mdspan.extents.cons/span.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ int main(int, char**)

static_assert( is_span_cons_avail_v< cuda::std::dextents<int,2>, my_int, 2 > == true , "" );

#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000)
#if !defined(TEST_COMPILER_NVCC_BELOW_11_3)
// Constraint: rank consistency
static_assert( is_span_cons_avail_v< cuda::std::dextents<int,1>, int , 2 > == false, "" );

Expand All @@ -67,7 +67,7 @@ int main(int, char**)
#ifndef TEST_COMPILER_NVHPC
static_assert( is_span_cons_avail_v< cuda::std::dextents<int,1>, my_int_non_nothrow_constructible, 1 > == false, "" );
#endif // TEST_COMPILER_NVHPC
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000)
#endif // !defined(TEST_COMPILER_NVCC_BELOW_11_3)

return 0;
}
4 changes: 2 additions & 2 deletions libcudacxx/.upstream-tests/test/std/iterators/iterator.range/begin-end.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ void test_const_array( const T (&array)[Sz] ) {

STATIC_TEST_GLOBAL_VAR TEST_CONSTEXPR_GLOBAL int global_array [] { 1, 2, 3 };
#if TEST_STD_VER > 14
#if !defined(TEST_COMPILER_NVCC) || _LIBCUDACXX_CUDACC_VER >= 1103000
#if !defined(TEST_COMPILER_NVCC_BELOW_11_3)
STATIC_TEST_GLOBAL_VAR TEST_CONSTEXPR_GLOBAL int global_const_array[] = {0,1,2,3,4};
#endif // nvcc > 11.2
#endif // TEST_STD_VER > 14
Expand Down Expand Up @@ -216,7 +216,7 @@ int main(int, char**) {
static_assert ( *cuda::std::crbegin(local_const_array) == 4, "" );
}

#if !defined(TEST_COMPILER_NVCC) || _LIBCUDACXX_CUDACC_VER >= 1103000
#if !defined(TEST_COMPILER_NVCC_BELOW_11_3)
{

static_assert ( *cuda::std::begin(global_const_array) == 0, "" );
Expand Down
4 changes: 2 additions & 2 deletions ...-tests/test/std/utilities/expected/expected.expected/ctor/ctor.inplace_init_list.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ __host__ __device__ void testException() {
int main(int, char**) {
test();
#if defined(_LIBCUDACXX_ADDRESSOF)
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test(), "");
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // defined(_LIBCUDACXX_ADDRESSOF)
testException();
return 0;
Expand Down
4 changes: 2 additions & 2 deletions ...tests/test/std/utilities/expected/expected.expected/ctor/ctor.unexpect_init_list.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,9 @@ __host__ __device__ void testException() {
int main(int, char**) {
test();
#if defined(_LIBCUDACXX_ADDRESSOF)
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test(), "");
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // defined(_LIBCUDACXX_ADDRESSOF)
testException();
return 0;
Expand Down
4 changes: 2 additions & 2 deletions ...x/.upstream-tests/test/std/utilities/expected/expected.expected/monadic/and_then.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@ constexpr bool test() {

int main(int, char**) {
test();
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test(), "");
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
return 0;
}
4 changes: 2 additions & 2 deletions ...xx/.upstream-tests/test/std/utilities/expected/expected.expected/monadic/or_else.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@ constexpr bool test() {

int main(int, char**) {
test();
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test(), "");
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
return 0;
}
4 changes: 2 additions & 2 deletions ...dacxx/.upstream-tests/test/std/utilities/expected/expected.void/monadic/and_then.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@ constexpr bool test() {

int main(int, char**) {
test();
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test(), "");
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
return 0;
}
4 changes: 2 additions & 2 deletions ...udacxx/.upstream-tests/test/std/utilities/expected/expected.void/monadic/or_else.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,8 +355,8 @@ constexpr bool test() {

int main(int, char**) {
test();
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test(), "");
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
return 0;
}
4 changes: 2 additions & 2 deletions ...acxx/.upstream-tests/test/std/utilities/expected/expected.void/monadic/transform.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@ constexpr bool test() {

int main(int, char**) {
test();
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test(), "");
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
return 0;
}
4 changes: 2 additions & 2 deletions ...udacxx/.upstream-tests/test/std/utilities/expected/expected.void/observers/deref.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ __host__ __device__ constexpr bool test() {

int main(int, char**) {
test();
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test(), "");
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
return 0;
}
4 changes: 2 additions & 2 deletions ...udacxx/.upstream-tests/test/std/utilities/expected/expected.void/observers/value.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ __host__ __device__ void testException() {

int main(int, char**) {
test();
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test(), "");
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
testException();
return 0;
}
4 changes: 2 additions & 2 deletions libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ constexpr bool test() {
int main(int, char**) {
test();
#if TEST_STD_VER >= 17
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif

return 0;
Expand Down
4 changes: 2 additions & 2 deletions libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ constexpr bool test() {
int main(int, char**) {
test();
#if TEST_STD_VER >= 17
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif

return 0;
Expand Down
4 changes: 2 additions & 2 deletions ...x/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ constexpr bool test() {
int main(int, char**) {
test();
#if TEST_STD_VER >= 17
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif

return 0;
Expand Down
4 changes: 2 additions & 2 deletions ...acxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ constexpr bool test() {
int main(int, char**) {
test();
#if TEST_STD_VER >= 17
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif

return 0;
Expand Down
4 changes: 2 additions & 2 deletions ...dacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ constexpr bool test() {
int main(int, char**) {
test();
#if TEST_STD_VER >= 17
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif

return 0;
Expand Down
4 changes: 2 additions & 2 deletions ...dacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ constexpr bool test() {
int main(int, char**) {
test();
#if TEST_STD_VER >= 17
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif

return 0;
Expand Down
4 changes: 2 additions & 2 deletions libcudacxx/.upstream-tests/test/std/utilities/optional/optional.monadic/or_else.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ TEST_CONSTEXPR_CXX17 bool test_nontrivial() {
int main(int, char**) {
test();
test_nontrivial();
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
// GCC <9 incorrectly trips on the assertions in this, so disable it there
#if TEST_STD_VER > 14 && (!defined(TEST_COMPILER_GCC) || __GNUC__ < 9)
static_assert(test(), "");
Expand All @@ -138,6 +138,6 @@ int main(int, char**) {
static_assert(test_nontrivial());
#endif // defined(_LIBCUDACXX_ADDRESSOF)
#endif // TEST_STD_VER > 17
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
return 0;
}
4 changes: 2 additions & 2 deletions libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/equal.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ constexpr bool test() {
int main(int, char**) {
test();
#if TEST_STD_VER >= 17
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif

return 0;
Expand Down
4 changes: 2 additions & 2 deletions libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/greater.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ constexpr bool test() {
int main(int, char**) {
test();
#if TEST_STD_VER >= 17
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif

return 0;
Expand Down
4 changes: 2 additions & 2 deletions ...dacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/greater_equal.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ constexpr bool test() {
int main(int, char**) {
test();
#if TEST_STD_VER >= 17
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif

return 0;
Expand Down
4 changes: 2 additions & 2 deletions libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/less_equal.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ constexpr bool test() {
int main(int, char**) {
test();
#if TEST_STD_VER >= 17
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif

return 0;
Expand Down
4 changes: 2 additions & 2 deletions libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/less_than.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ constexpr bool test() {
int main(int, char**) {
test();
#if TEST_STD_VER >= 17
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif

return 0;
Expand Down
4 changes: 2 additions & 2 deletions libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/not_equal.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ constexpr bool test() {
int main(int, char**) {
test();
#if TEST_STD_VER >= 17
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif

return 0;
Expand Down
4 changes: 2 additions & 2 deletions .../test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,9 +315,9 @@ int main(int, char**)
test_throws();

#if !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(pr38638(3) == 5, "");
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !defined(TEST_COMPILER_GCC) || __GNUC__ > 6

return 0;
Expand Down
4 changes: 2 additions & 2 deletions ...t/std/utilities/optional/optional.object/optional.object.assign/const_optional_U.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ int main(int, char**)
{
test_with_test_type();
test_ambiguous_assign();
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
{
optional<int> opt;
constexpr optional<short> opt2;
Expand Down Expand Up @@ -236,7 +236,7 @@ int main(int, char**)
assert(static_cast<bool>(opt) == static_cast<bool>(opt2));
assert(*opt == *opt2);
}
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#ifndef TEST_HAS_NO_EXCEPTIONS
{
optional<X> opt;
Expand Down
8 changes: 4 additions & 4 deletions ...am-tests/test/std/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,21 +59,21 @@ int main(int, char**)
{
using O = optional<int>;
#if !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(assign_empty(O{42}), "");
static_assert(assign_value(O{42}), "");
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
assert(assign_empty(O{42}));
assert(assign_value(O{42}));
}
{
using O = optional<TrivialTestTypes::TestType>;
#if !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(assign_empty(O{42}), "");
static_assert(assign_value(O{42}), "");
#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
assert(assign_empty(O{42}));
assert(assign_value(O{42}));
Expand Down
Loading

0 comments on commit 3a4927a

Please sign in to comment.