Using #undef _ before "#include <catch.hpp>", as suggested by @henryiii (#3747)

This commit is contained in:
Ralf W. Grosse-Kunstleve 2022-02-18 11:51:56 -08:00 committed by GitHub
parent f5901b5465
commit 97862b126a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions

View File

@ -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: >

View File

@ -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: >

View File

@ -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"