Skip to content

Fix feature detection of __VA_OPT__ for MSVC #345

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

Merged
rollbear merged 2 commits into from
Mar 30, 2025
Merged

Fix feature detection of __VA_OPT__ for MSVC #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcb489c
Add MSVC configuration with /Zc:__cppstd set to c++20
puetzk Mar 27, 2025
cb808e2
Fix detection of TROMPELOEIL_HAS_VA_OPT for MSVC
puetzk Mar 27, 2025
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
14 changes: 14 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1675,6 +1675,13 @@ jobs:
cc: "cl", cxx: "cl",
cxx_standard: 20,
}
- {
name: "Windows MSVC 2022 C++20 __cppstd",
os: windows-2022,
cc: "cl", cxx: "cl",
cxx_standard: 20,
cxx_flags: "/Zc:__cplusplus"
}
- {
name: "Windows MSVC 2022 C++20 preprocessor",
os: windows-2022,
Expand Down Expand Up @@ -1729,6 +1736,13 @@ jobs:
cc: "cl", cxx: "cl",
cxx_standard: 20,
}
- {
name: "Windows MSVC 2019 C++20 __cppstd",
os: windows-2019,
cc: "cl", cxx: "cl",
cxx_standard: 20,
cxx_flags: "/Zc:__cplusplus"
}
- {
name: "Windows MSVC 2019 C++20 preprocessor",
os: windows-2019,
Expand Down
14 changes: 8 additions & 6 deletions include/trompeloeil/mock.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,15 @@
#define TROMPELOEIL_NOT_IMPLEMENTED(...) __VA_ARGS__
#endif

#if defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL==0
# if _MSC_VER >= 1940
# define TROMPELOEIL_HAS_VA_OPT 1
# else
# define TROMPELOEIL_HAS_VA_OPT 0
#if defined(_MSVC_TRADITIONAL)
# if _MSVC_TRADITIONAL==0
# if (_MSC_VER >= 1940) || ((_MSVC_VER >= 1926) && (_MSVC_LANG > 201703L))
# define TROMPELOEIL_HAS_VA_OPT 1
# else
# define TROMPELOEIL_HAS_VA_OPT 0
# endif
# define TROMPELOEIL_MSVC_PREPROCESSOR 0
# endif
# define TROMPELOEIL_MSVC_PREPROCESSOR 0
#elif __cplusplus >= 202002L
# define TROMPELOEIL_HAS_VA_OPT 1
#else
Expand Down
Loading