mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-22 13:15:12 +00:00
Using #undef _
before "#include <catch.hpp>", as suggested by @henryiii (#3747)
This commit is contained in:
parent
f5901b5465
commit
97862b126a
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@ -45,7 +45,7 @@ jobs:
|
|||||||
python: '3.6'
|
python: '3.6'
|
||||||
args: >
|
args: >
|
||||||
-DPYBIND11_FINDPYTHON=ON
|
-DPYBIND11_FINDPYTHON=ON
|
||||||
# BREAKS -DCMAKE_CXX_FLAGS="-D_=1"
|
-DCMAKE_CXX_FLAGS="-D_=1"
|
||||||
- runs-on: windows-latest
|
- runs-on: windows-latest
|
||||||
python: '3.6'
|
python: '3.6'
|
||||||
args: >
|
args: >
|
||||||
|
2
.github/workflows/ci_sh_def.yml
vendored
2
.github/workflows/ci_sh_def.yml
vendored
@ -57,7 +57,7 @@ jobs:
|
|||||||
python: '3.6'
|
python: '3.6'
|
||||||
args: >
|
args: >
|
||||||
-DPYBIND11_FINDPYTHON=ON
|
-DPYBIND11_FINDPYTHON=ON
|
||||||
# BREAKS -DCMAKE_CXX_FLAGS="-D_=1"
|
-DCMAKE_CXX_FLAGS="-D_=1"
|
||||||
- runs-on: windows-latest
|
- runs-on: windows-latest
|
||||||
python: '3.6'
|
python: '3.6'
|
||||||
args: >
|
args: >
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
#include "pybind11/detail/smart_holder_poc.h"
|
#include "pybind11/detail/smart_holder_poc.h"
|
||||||
|
|
||||||
|
// Catch uses _ internally, which breaks gettext style defines
|
||||||
|
#ifdef _
|
||||||
|
# undef _
|
||||||
|
#endif
|
||||||
|
|
||||||
#define CATCH_CONFIG_MAIN
|
#define CATCH_CONFIG_MAIN
|
||||||
#include "catch.hpp"
|
#include "catch.hpp"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user