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

Jump to bottom

[BUG] Fix compilation issues with MSVC 2017 #196

Merged
merged 12 commits into from
Jul 26, 2023
Merged

[BUG] Fix compilation issues with MSVC 2017 #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0edfc69
Remove unneeded `"-Wc++17-extensions"` warning supppression
miscco Jul 11, 2023
a8b2fe8
Use `__pragma` for msvc instead of `_Pragma`
miscco Jul 11, 2023
c55cad7
NFC: minor cleanup for `swap` concept emulation
miscco Jul 11, 2023
0df3186
Replace `TEST_COMPILER_C1XX` with `TEST_COMPILER_MSVC`
miscco Jul 11, 2023
f0fb6f3
Make `tuple` compile with MSVC 2017
miscco Jul 11, 2023
8d9fc23
Make `concepts` tests pass with MSVC2017
miscco Jul 11, 2023
77993c1
Make `span` compile with MSVC 2017
miscco Jul 11, 2023
d630c2a
Make `expected` work with MSVC2017
miscco Jul 11, 2023
935810b
Make `exchange` test pass for MSVC 2017
miscco Jul 11, 2023
8f8cc8b
Make `optional` compile with MSVC 2017
miscco Jul 11, 2023
89dd724
Make `bind_front` pass with MSVC 2017
miscco Jul 11, 2023
c27c8a0
[skip-tests] Suppress some failing tests
miscco Jul 11, 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
2 changes: 1 addition & 1 deletion libcudacxx/.upstream-tests/test/std/atomics/atomics.flag/default.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include "test_macros.h"

#if !defined(TEST_COMPILER_C1XX)
#if !defined(TEST_COMPILER_MSVC)
#include "placement_new.h"
#endif
#include "cuda_space_selector.h"
Expand Down
2 changes: 1 addition & 1 deletion libcudacxx/.upstream-tests/test/std/atomics/atomics.types.generic/address.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
#include <cmpxchg_loop.h>

#include "test_macros.h"
#if !defined(TEST_COMPILER_C1XX)
#if !defined(TEST_COMPILER_MSVC)
#include "placement_new.h"
#endif
#include "cuda_space_selector.h"
Expand Down
2 changes: 1 addition & 1 deletion libcudacxx/.upstream-tests/test/std/atomics/atomics.types.generic/address_ref.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
#include <cmpxchg_loop.h>

#include "test_macros.h"
#if !defined(TEST_COMPILER_C1XX)
#if !defined(TEST_COMPILER_MSVC)
#include "placement_new.h"
#endif
#include "cuda_space_selector.h"
Expand Down
2 changes: 1 addition & 1 deletion ...cxx/.upstream-tests/test/std/atomics/atomics.types.generic/address_ref_constness.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
#include <cmpxchg_loop.h>

#include "test_macros.h"
#if !defined(TEST_COMPILER_C1XX)
#if !defined(TEST_COMPILER_MSVC)
#include "placement_new.h"
#endif
#include "cuda_space_selector.h"
Expand Down
2 changes: 1 addition & 1 deletion libcudacxx/.upstream-tests/test/std/atomics/atomics.types.generic/bool.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
#include <cmpxchg_loop.h>

#include "test_macros.h"
#if !defined(TEST_COMPILER_C1XX)
#if !defined(TEST_COMPILER_MSVC)
#include "placement_new.h"
#endif
#include "cuda_space_selector.h"
Expand Down
2 changes: 1 addition & 1 deletion libcudacxx/.upstream-tests/test/std/atomics/atomics.types.generic/floating_point.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
#include <cmpxchg_loop.h>

#include "test_macros.h"
#if !defined(TEST_COMPILER_C1XX)
#if !defined(TEST_COMPILER_MSVC)
#include "placement_new.h"
#endif
#include "cuda_space_selector.h"
Expand Down
2 changes: 1 addition & 1 deletion ...udacxx/.upstream-tests/test/std/atomics/atomics.types.generic/floating_point_ref.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
#include <cmpxchg_loop.h>

#include "test_macros.h"
#if !defined(TEST_COMPILER_C1XX)
#if !defined(TEST_COMPILER_MSVC)
#include "placement_new.h"
#endif
#include "cuda_space_selector.h"
Expand Down
2 changes: 1 addition & 1 deletion ...stream-tests/test/std/atomics/atomics.types.generic/floating_point_ref_constness.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <cmpxchg_loop.h>

#include "test_macros.h"
#if !defined(TEST_COMPILER_C1XX)
#if !defined(TEST_COMPILER_MSVC)
#include "placement_new.h"
#endif
#include "cuda_space_selector.h"
Expand Down
2 changes: 1 addition & 1 deletion libcudacxx/.upstream-tests/test/std/atomics/atomics.types.generic/integral.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
#include <cmpxchg_loop.h>

#include "test_macros.h"
#if !defined(TEST_COMPILER_C1XX)
#if !defined(TEST_COMPILER_MSVC)
#include "placement_new.h"
#endif
#include "cuda_space_selector.h"
Expand Down
2 changes: 1 addition & 1 deletion libcudacxx/.upstream-tests/test/std/atomics/atomics.types.generic/integral_ref.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
#include <cmpxchg_loop.h>

#include "test_macros.h"
#if !defined(TEST_COMPILER_C1XX)
#if !defined(TEST_COMPILER_MSVC)
#include "placement_new.h"
#endif
#include "cuda_space_selector.h"
Expand Down
2 changes: 1 addition & 1 deletion ...xx/.upstream-tests/test/std/atomics/atomics.types.generic/integral_ref_constness.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
#include <cmpxchg_loop.h>

#include "test_macros.h"
#if !defined(TEST_COMPILER_C1XX)
#if !defined(TEST_COMPILER_MSVC)
#include "placement_new.h"
#endif
#include "cuda_space_selector.h"
Expand Down
2 changes: 1 addition & 1 deletion libcudacxx/.upstream-tests/test/std/atomics/atomics.types.generic/non_arithmetic.fail.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <cuda/std/cassert>

#include "test_macros.h"
#if !defined(TEST_COMPILER_C1XX)
#if !defined(TEST_COMPILER_MSVC)
#include "placement_new.h"
#endif
#include "cuda_space_selector.h"
Expand Down
3 changes: 0 additions & 3 deletions ...s/test/std/concepts/concepts.callable/concept.equiv/equivalence_relation.compile.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
// template<class F, class... Args>
// concept equivalence_relation;

#if defined(__clang__)
#pragma clang diagnostic ignored "-Wc++17-extensions"
#endif

#include <cuda/std/concepts>

Expand Down
20 changes: 16 additions & 4 deletions ...am-tests/test/std/concepts/concepts.callable/concept.invocable/invocable.compile.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,13 @@
// template<class T, class U>
// concept invocable;

#if defined(__clang__)
#pragma clang diagnostic ignored "-Wc++17-extensions"
#endif

#include <cuda/std/chrono>
#include <cuda/std/concepts>
#include <cuda/std/functional>
#include <cuda/std/type_traits>

#include "test_macros.h"

using cuda::std::invocable;

template <class R, class... Args>
Expand Down Expand Up @@ -319,7 +317,9 @@ static_assert(invocable<lvalue_qualified, S&>, "");
static_assert(!invocable<lvalue_qualified, S const&>, "");
static_assert(!invocable<lvalue_qualified, S volatile&>, "");
static_assert(!invocable<lvalue_qualified, S const volatile&>, "");
#ifndef TEST_COMPILER_MSVC_2017
static_assert(!invocable<lvalue_qualified, S&&>, "");
#endif // !TEST_COMPILER_MSVC_2017
static_assert(!invocable<lvalue_qualified, S const&&>, "");
static_assert(!invocable<lvalue_qualified, S volatile&&>, "");
static_assert(!invocable<lvalue_qualified, S const volatile&&>, "");
Expand All @@ -345,39 +345,47 @@ static_assert(invocable<lvalue_volatile_qualified, S&>, "");
static_assert(!invocable<lvalue_volatile_qualified, S const&>, "");
static_assert(invocable<lvalue_volatile_qualified, S volatile&>, "");
static_assert(!invocable<lvalue_volatile_qualified, S const volatile&>, "");
#ifndef TEST_COMPILER_MSVC_2017
static_assert(!invocable<lvalue_volatile_qualified, S&&>, "");
static_assert(!invocable<lvalue_volatile_qualified, S const&&>, "");
static_assert(!invocable<lvalue_volatile_qualified, S volatile&&>, "");
static_assert(!invocable<lvalue_volatile_qualified, S const volatile&&>, "");
#endif // !TEST_COMPILER_MSVC_2017

static_assert(check_member_is_invocable<int (S::*)() const volatile&, S&>(), "");
using lvalue_cv_qualified = void (S::*)() const volatile&;
static_assert(invocable<lvalue_cv_qualified, S&>, "");
static_assert(invocable<lvalue_cv_qualified, S const&>, "");
static_assert(invocable<lvalue_cv_qualified, S volatile&>, "");
static_assert(invocable<lvalue_cv_qualified, S const volatile&>, "");
#ifndef TEST_COMPILER_MSVC_2017
static_assert(!invocable<lvalue_cv_qualified, S&&>, "");
static_assert(!invocable<lvalue_cv_qualified, S const&&>, "");
static_assert(!invocable<lvalue_cv_qualified, S volatile&&>, "");
static_assert(!invocable<lvalue_cv_qualified, S const volatile&&>, "");
#endif // !TEST_COMPILER_MSVC_2017

using rvalue_unqualified = void (S::*)() &&;
static_assert(!invocable<rvalue_unqualified, S&>, "");
static_assert(!invocable<rvalue_unqualified, S const&>, "");
static_assert(!invocable<rvalue_unqualified, S volatile&>, "");
static_assert(!invocable<rvalue_unqualified, S const volatile&>, "");
#ifndef TEST_COMPILER_MSVC_2017
static_assert(invocable<rvalue_unqualified, S&&>, "");
static_assert(!invocable<rvalue_unqualified, S const&&>, "");
static_assert(!invocable<rvalue_unqualified, S volatile&&>, "");
static_assert(!invocable<rvalue_unqualified, S const volatile&&>, "");
#endif // !TEST_COMPILER_MSVC_2017

using rvalue_const_unqualified = void (S::*)() const&&;
static_assert(!invocable<rvalue_const_unqualified, S&>, "");
static_assert(!invocable<rvalue_const_unqualified, S const&>, "");
static_assert(!invocable<rvalue_const_unqualified, S volatile&>, "");
static_assert(!invocable<rvalue_const_unqualified, S const volatile&>, "");
#ifndef TEST_COMPILER_MSVC_2017
static_assert(invocable<rvalue_const_unqualified, S&&>, "");
static_assert(invocable<rvalue_const_unqualified, S const&&>, "");
#endif // !TEST_COMPILER_MSVC_2017
static_assert(!invocable<rvalue_const_unqualified, S volatile&&>, "");
static_assert(!invocable<rvalue_const_unqualified, S const volatile&&>, "");

Expand All @@ -386,20 +394,24 @@ static_assert(!invocable<rvalue_volatile_unqualified, S&>, "");
static_assert(!invocable<rvalue_volatile_unqualified, S const&>, "");
static_assert(!invocable<rvalue_volatile_unqualified, S volatile&>, "");
static_assert(!invocable<rvalue_volatile_unqualified, S const volatile&>, "");
#ifndef TEST_COMPILER_MSVC_2017
static_assert(invocable<rvalue_volatile_unqualified, S&&>, "");
static_assert(!invocable<rvalue_volatile_unqualified, S const&&>, "");
static_assert(invocable<rvalue_volatile_unqualified, S volatile&&>, "");
static_assert(!invocable<rvalue_volatile_unqualified, S const volatile&&>, "");
#endif // !TEST_COMPILER_MSVC_2017

using rvalue_cv_unqualified = void (S::*)() const volatile&&;
static_assert(!invocable<rvalue_cv_unqualified, S&>, "");
static_assert(!invocable<rvalue_cv_unqualified, S const&>, "");
static_assert(!invocable<rvalue_cv_unqualified, S volatile&>, "");
static_assert(!invocable<rvalue_cv_unqualified, S const volatile&>, "");
#ifndef TEST_COMPILER_MSVC_2017
static_assert(invocable<rvalue_cv_unqualified, S&&>, "");
static_assert(invocable<rvalue_cv_unqualified, S const&&>, "");
static_assert(invocable<rvalue_cv_unqualified, S volatile&&>, "");
static_assert(invocable<rvalue_cv_unqualified, S const volatile&&>, "");
#endif // !TEST_COMPILER_MSVC_2017
} // namespace pointer_to_member_functions

// Check the concept with closure types
Expand Down
7 changes: 2 additions & 5 deletions ...am-tests/test/std/concepts/concepts.callable/concept.predicate/predicate.compile.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
// template<class F, class... Args>
// concept predicate;

#if defined(__clang__)
#pragma clang diagnostic ignored "-Wc++17-extensions"
#endif

#include <cuda/std/concepts>
#include <cuda/std/type_traits>
Expand Down Expand Up @@ -43,9 +40,9 @@ static_assert(!predicate<void (S::*)(), S&>, "");

static_assert(!predicate<bool(S)>, "");
static_assert(!predicate<bool(S)>, "");
#if !defined(TEST_COMPILER_C1XX) || TEST_STD_VER > 17 // unspecified MSVC bug
#if !defined(TEST_COMPILER_MSVC) || TEST_STD_VER > 17 // unspecified MSVC bug
static_assert(!predicate<bool(S&), S>, "");
#endif // !defined(TEST_COMPILER_C1XX) || TEST_STD_VER > 17
#endif // !defined(TEST_COMPILER_MSVC) || TEST_STD_VER > 17
static_assert(!predicate<bool(S&), S const&>, "");
static_assert(predicate<bool(S&), S&>, "");

Expand Down
Loading
Loading