Commit 9379b399 by Henry Schreiner Committed by GitHub

fix: MSVC 2017 C++17 on Python 3 regression (#3407)

* fix: MSVC 2017 C++17 on Python 3 regression

* ci: add 3.7 job on CI
parent 78ee782b
...@@ -851,6 +851,10 @@ jobs: ...@@ -851,6 +851,10 @@ jobs:
std: 17 std: 17
args: > args: >
-DCMAKE_CXX_FLAGS="/permissive- /EHsc /GR" -DCMAKE_CXX_FLAGS="/permissive- /EHsc /GR"
- python: 3.7
std: 17
args: >
-DCMAKE_CXX_FLAGS="/permissive- /EHsc /GR"
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
......
...@@ -69,7 +69,7 @@ public: ...@@ -69,7 +69,7 @@ public:
// ensure GIL is held during functor destruction // ensure GIL is held during functor destruction
struct func_handle { struct func_handle {
function f; function f;
#if !(defined(_MSC_VER) && _MSC_VER == 1916 && defined(PYBIND11_CPP17) && PY_MAJOR_VERSION < 3) #if !(defined(_MSC_VER) && _MSC_VER == 1916 && defined(PYBIND11_CPP17))
// This triggers a syntax error under very special conditions (very weird indeed). // This triggers a syntax error under very special conditions (very weird indeed).
explicit explicit
#endif #endif
......
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