Skip to content

GitLab

Commit 3789b4f9 authored by Henry Schreiner's avatar Henry Schreiner Committed by Wenzel Jakob
Browse files

Update C++ macros for C++17 and MSVC Z mode (#1347)

parent 7bb1da96
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
include/pybind11/detail/common.h
View file @ 3789b4f9
...@@ -27,15 +27,16 @@ ...@@ -27,15 +27,16 @@
# endif # endif
#endif #endif
#if !defined(_MSC_VER) && !defined(__INTEL_COMPILER) #if !(defined(_MSC_VER) && __cplusplus == 199711L) && !defined(__INTEL_COMPILER)
# if __cplusplus >= 201402L # if __cplusplus >= 201402L
# define PYBIND11_CPP14 # define PYBIND11_CPP14
# if __cplusplus > 201402L /* Temporary: should be updated to >= the final C++17 value once known */ # if __cplusplus >= 201703L
# define PYBIND11_CPP17 # define PYBIND11_CPP17
# endif # endif
# endif # endif
#elif defined(_MSC_VER) #elif defined(_MSC_VER) && __cplusplus == 199711L
// MSVC sets _MSVC_LANG rather than __cplusplus (supposedly until the standard is fully implemented) // MSVC sets _MSVC_LANG rather than __cplusplus (supposedly until the standard is fully implemented)
// Unless you use the /Zc:__cplusplus flag on Visual Studio 2017 15.7 Preview 3 or newer
# if _MSVC_LANG >= 201402L # if _MSVC_LANG >= 201402L
# define PYBIND11_CPP14 # define PYBIND11_CPP14
# if _MSVC_LANG > 201402L && _MSC_VER >= 1910 # if _MSVC_LANG > 201402L && _MSC_VER >= 1910
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment