RYDE-WORK/pybind11
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/pybind11.git synced 2026-02-03 14:03:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix incorrect in macro if statement

Browse Source
This commit is contained in:
Wenzel Jakob 2016-05-01 20:47:49 +02:00
parent bd57eb484d
commit 6d2529613a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/pybind11/pybind11.h
View File

@ -20,7 +20,7 @@
#elif defined(__ICC) || defined(__INTEL_COMPILER) #elif defined(__ICC) || defined(__INTEL_COMPILER)
# pragma warning(push) # pragma warning(push)
# pragma warning(disable:2196) // warning #2196: routine is both "inline" and "noinline" # pragma warning(disable:2196) // warning #2196: routine is both "inline" and "noinline"
#elif defined(__GNUG__) and !defined(__clang__) #elif defined(__GNUG__) && !defined(__clang__)
# pragma GCC diagnostic push # pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunused-but-set-parameter" # pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
# pragma GCC diagnostic ignored "-Wunused-but-set-variable" # pragma GCC diagnostic ignored "-Wunused-but-set-variable"
@ -1218,6 +1218,6 @@ NAMESPACE_END(pybind11)
# pragma warning(pop) # pragma warning(pop)
#elif defined(__ICC) || defined(__INTEL_COMPILER) #elif defined(__ICC) || defined(__INTEL_COMPILER)
# pragma warning(pop) # pragma warning(pop)
#elif defined(__GNUG__) and !defined(__clang__) #elif defined(__GNUG__) && !defined(__clang__)
# pragma GCC diagnostic pop # pragma GCC diagnostic pop
#endif #endif