Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge commits from 2.2 branch #350

Merged
merged 4 commits into from
Aug 17, 2023
Merged

Merge commits from 2.2 branch #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1133ef7
Fix `cudacc` and `nvcc` mixup. (#329)
wmaxey Aug 15, 2023
02ba196
[skip-tests] Use builtin for `destructible` concept on MSVC (#333)
miscco Aug 15, 2023
cbe7067
[skip-test] Fix merge conflict from two inflight PRs (#338)
miscco Aug 15, 2023
936b97a
[skip-tests] Use global qualification for internal use
miscco Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...dacxx/.upstream-tests/test/std/containers/views/mdspan/mdspan.extents.cons/array.pass.cpp
View file
Open in desktop
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_BELOW_11_3)
#if !defined(TEST_COMPILER_CUDACC_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_BELOW_11_3)
#endif // !defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3)
#if !defined(TEST_COMPILER_CUDACC_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_BELOW_11_3)
#endif // !defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3)
#if !defined(TEST_COMPILER_CUDACC_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_BELOW_11_3)
#if !defined(TEST_COMPILER_CUDACC_BELOW_11_3)
{

static_assert ( *cuda::std::begin(global_const_array) == 0, "" );
Expand Down
12 changes: 6 additions & 6 deletions ...tors/iterator.requirements/alg.req.ind.copy/indirectly_copyable_storable.compile.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,42 +158,42 @@ struct DeletedCopyCtor {
DeletedCopyCtor& operator=(DeletedCopyCtor const&) = default;
};

#if TEST_STD_VER > 17 || !defined(TEST_COMPILER_C1XX) // multiple versions of a defaulted special member functions are not allowed
#if TEST_STD_VER > 17 || !defined(TEST_COMPILER_MSVC) // multiple versions of a defaulted special member functions are not allowed
struct DeletedNonconstCopyCtor {
DeletedNonconstCopyCtor(DeletedNonconstCopyCtor const&) = default;
DeletedNonconstCopyCtor(DeletedNonconstCopyCtor&) = delete;
DeletedNonconstCopyCtor& operator=(DeletedNonconstCopyCtor const&) = default;
};
static_assert(!cuda::std::indirectly_copyable_storable<DeletedNonconstCopyCtor*, DeletedNonconstCopyCtor*>);
#endif // TEST_STD_VER > 17 || !defined(TEST_COMPILER_C1XX)
#endif // TEST_STD_VER > 17 || !defined(TEST_COMPILER_MSVC)

struct DeletedMoveCtor {
DeletedMoveCtor(DeletedMoveCtor&&) = delete;
DeletedMoveCtor& operator=(DeletedMoveCtor&&) = default;
};

#if TEST_STD_VER > 17 || !defined(TEST_COMPILER_C1XX) // multiple versions of a defaulted special member functions are not allowed
#if TEST_STD_VER > 17 || !defined(TEST_COMPILER_MSVC) // multiple versions of a defaulted special member functions are not allowed
struct DeletedConstMoveCtor {
DeletedConstMoveCtor(DeletedConstMoveCtor&&) = default;
DeletedConstMoveCtor(DeletedConstMoveCtor const&&) = delete;
DeletedConstMoveCtor& operator=(DeletedConstMoveCtor&&) = default;
};
static_assert(!cuda::std::indirectly_copyable_storable<DeletedConstMoveCtor*, DeletedConstMoveCtor*>);
#endif // TEST_STD_VER > 17 || !defined(TEST_COMPILER_C1XX)
#endif // TEST_STD_VER > 17 || !defined(TEST_COMPILER_MSVC)

struct DeletedCopyAssignment {
DeletedCopyAssignment(DeletedCopyAssignment const&) = default;
DeletedCopyAssignment& operator=(DeletedCopyAssignment const&) = delete;
};

#if TEST_STD_VER > 17 || !defined(TEST_COMPILER_C1XX) // multiple versions of a defaulted special member functions are not allowed
#if TEST_STD_VER > 17 || !defined(TEST_COMPILER_MSVC) // multiple versions of a defaulted special member functions are not allowed
struct DeletedNonconstCopyAssignment {
DeletedNonconstCopyAssignment(DeletedNonconstCopyAssignment const&) = default;
DeletedNonconstCopyAssignment& operator=(DeletedNonconstCopyAssignment const&) = default;
DeletedNonconstCopyAssignment& operator=(DeletedNonconstCopyAssignment&) = delete;
};
static_assert(!cuda::std::indirectly_copyable_storable<DeletedNonconstCopyAssignment*, DeletedNonconstCopyAssignment*>);
#endif // TEST_STD_VER > 17 || !defined(TEST_COMPILER_C1XX)
#endif // TEST_STD_VER > 17 || !defined(TEST_COMPILER_MSVC)

struct DeletedMoveAssignment {
DeletedMoveAssignment(DeletedMoveAssignment&&) = default;
Expand Down
4 changes: 2 additions & 2 deletions ...upstream-tests/test/std/iterators/iterator.requirements/iterator.concepts/incrementable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ struct postinc_not_declared {
using difference_type = int;

__host__ __device__ postinc_not_declared& operator++();
#if defined(TEST_COMPILER_C1XX) // MSVC complains about "single-argument function used for postfix "++" (anachronism)""
#if defined(TEST_COMPILER_MSVC) // MSVC complains about "single-argument function used for postfix "++" (anachronism)""
__host__ __device__ postinc_not_declared& operator++(int) = delete;
#endif // TEST_COMPILER_C1XX
#endif // TEST_COMPILER_MSVC
};

struct incrementable_with_difference_type {
Expand Down
4 changes: 2 additions & 2 deletions ...irements/iterator.concepts/iterator.concept.bidir/bidirectional_iterator.compile.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,9 @@ struct no_postdecrement {
__host__ __device__ no_postdecrement operator++(int);

__host__ __device__ no_postdecrement& operator--();
#if defined(TEST_COMPILER_C1XX) // single-argument function used for postfix "--" (anachronism)
#if defined(TEST_COMPILER_MSVC) // single-argument function used for postfix "--" (anachronism)
__host__ __device__ no_postdecrement& operator--(int) = delete;
#endif // TEST_COMPILER_C1XX
#endif // TEST_COMPILER_MSVC

#if TEST_STD_VER > 17
bool operator==(no_postdecrement const&) const = default;
Expand Down
4 changes: 2 additions & 2 deletions ...tor.requirements/iterator.concepts/iterator.concept.input/input_iterator.compile.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ struct not_weakly_incrementable {

__host__ __device__ int operator*() const;

#if defined(TEST_COMPILER_C1XX) // nvbug4119179
#if defined(TEST_COMPILER_MSVC) // nvbug4119179
__host__ __device__ void operator++(int);
#else
__host__ __device__ not_weakly_incrementable& operator++();
#endif // TEST_COMPILER_C1XX
#endif // TEST_COMPILER_MSVC
};
static_assert(!cuda::std::input_or_output_iterator<not_weakly_incrementable> &&
!cuda::std::input_iterator<not_weakly_incrementable>);
Expand Down
4 changes: 2 additions & 2 deletions ...t/std/iterators/iterator.requirements/iterator.cust/iterator.cust.move/iter_move.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,10 @@ __host__ __device__ constexpr bool test() {
return true;
}

#ifndef _LIBCUDACXX_COMPILER_NVCC_BELOW_11_3 // nvcc segfaults here
#ifndef _LIBCUDACXX_CUDACC_BELOW_11_3 // nvcc segfaults here
static_assert(!cuda::std::is_invocable_v<IterMoveT, int*, int*>); // too many arguments
static_assert(!cuda::std::is_invocable_v<IterMoveT, int>);
#endif // _LIBCUDACXX_COMPILER_NVCC_BELOW_11_3
#endif // _LIBCUDACXX_CUDACC_BELOW_11_3

#if TEST_STD_VER > 17
// Test ADL-proofing.
Expand Down
4 changes: 2 additions & 2 deletions ...-tests/test/std/utilities/expected/expected.expected/ctor/ctor.inplace_init_list.pass.cpp
View file
Open in desktop
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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test(), "");
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test(), "");
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test(), "");
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test(), "");
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test(), "");
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test(), "");
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test(), "");
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test(), "");
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test(), "");
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_CUDACC_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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_CUDACC_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
Open in desktop
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_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
static_assert(test());
#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
#endif

return 0;
Expand Down
Loading