Skip to content

Commit f022a3c

Browse files
committed
Fixing condition for pragma GCC diagnostic push in pybind11.h
1 parent 935d25f commit f022a3c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

include/pybind11/pybind11.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# pragma warning(disable: 4100) // warning C4100: Unreferenced formal parameter
1919
# pragma warning(disable: 4127) // warning C4127: Conditional expression is constant
2020
# pragma warning(disable: 4505) // warning C4505: 'PySlice_GetIndicesEx': unreferenced local function has been removed (PyPy only)
21-
#elif defined(__GNUG__) && !defined(__clang__)
21+
#elif defined(__GNUG__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
2222
# pragma GCC diagnostic push
2323
# pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
2424
# pragma GCC diagnostic ignored "-Wattributes"
@@ -2379,7 +2379,7 @@ PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
23792379
// THE `pop` HERE NEED TO BE KEPT IN SYNC WITH THE CORRESPONDING `push` AT THE TOP OF THIS FILE.
23802380
//
23812381
#if defined(_MSC_VER)
2382-
# pragma warning(pop)
2382+
# pragma warning(pop)
23832383
#elif defined(__GNUG__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
2384-
# pragma GCC diagnostic pop
2384+
# pragma GCC diagnostic pop
23852385
#endif

0 commit comments

Comments
 (0)