Skip to content

[Backport]Fix mpark/variant conditional for MSVC (#77) #89

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

Open
wants to merge 1 commit into
base: humble
Choose a base branch
from
Open

[Backport]Fix mpark/variant conditional for MSVC (#77) #89

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 osrf_testing_tools_cpp/include/osrf_testing_tools_cpp/variant_helper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#if defined(__has_include)

# if __has_include(<variant>)
# if _MSC_VER < 2000 // this is any version @ VS 2017 and earlier
# if defined(_MSC_VER) && _MSC_VER < 2000 // this is any version @ VS 2017 and earlier
// VS 2017 (_MSC_VER or 19XX) has <variant>, but it just contains an error macro...
# define __SHOULD_USE_MPARK_VARIANT 1
# else // _MSC_VER < 2000
Expand Down