Skip to content

GitLab

Commit 6d252961 authored by Wenzel Jakob's avatar Wenzel Jakob
Browse files

fix incorrect in macro if statement

parent bd57eb48
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
include/pybind11/pybind11.h
View file @ 6d252961
...@@ -20,7 +20,7 @@ ...@@ -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) ...@@ -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
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