Test language version using _MSVC_LANG rather than _HAS_CXX17.
This commit is contained in:
parent
2e30e9d327
commit
b397659ded
@ -70,9 +70,6 @@
|
||||
# define ASIO_MSVC _MSC_VER
|
||||
# endif // defined(ASIO_HAS_BOOST_CONFIG) && defined(BOOST_MSVC)
|
||||
#endif // !defined(ASIO_MSVC)
|
||||
#if defined(ASIO_MSVC)
|
||||
# include <ciso646> // Needed for _HAS_CXX17.
|
||||
#endif // defined(ASIO_MSVC)
|
||||
|
||||
// Clang / libc++ detection.
|
||||
#if defined(__clang__)
|
||||
@ -799,9 +796,9 @@
|
||||
# endif // (__cplusplus >= 201703)
|
||||
# endif // (__GNUC__ >= 7)
|
||||
# elif defined(ASIO_MSVC)
|
||||
# if (_MSC_VER >= 1910 && _HAS_CXX17)
|
||||
# if (_MSC_VER >= 1910 && _MSVC_LANG >= 201703)
|
||||
# define ASIO_HAS_STD_STRING_VIEW 1
|
||||
# endif // (_MSC_VER >= 1910 && _HAS_CXX17)
|
||||
# endif // (_MSC_VER >= 1910 && _MSVC_LANG >= 201703)
|
||||
# endif // defined(ASIO_MSVC)
|
||||
# endif // !defined(ASIO_DISABLE_STD_STRING_VIEW)
|
||||
#endif // !defined(ASIO_HAS_STD_STRING_VIEW)
|
||||
@ -859,9 +856,9 @@
|
||||
#if !defined(ASIO_HAS_STD_INVOKE_RESULT)
|
||||
# if !defined(ASIO_DISABLE_STD_INVOKE_RESULT)
|
||||
# if defined(ASIO_MSVC)
|
||||
# if (_MSC_VER >= 1910 && _HAS_CXX17)
|
||||
# if (_MSC_VER >= 1910 && _MSVC_LANG >= 201703)
|
||||
# define ASIO_HAS_STD_INVOKE_RESULT 1
|
||||
# endif // (_MSC_VER >= 1910 && _HAS_CXX17)
|
||||
# endif // (_MSC_VER >= 1910 && _MSVC_LANG >= 201703)
|
||||
# endif // defined(ASIO_MSVC)
|
||||
# endif // !defined(ASIO_DISABLE_STD_INVOKE_RESULT)
|
||||
#endif // !defined(ASIO_HAS_STD_INVOKE_RESULT)
|
||||
|
Loading…
Reference in New Issue
Block a user