Trying more after CI failure, adding push/pop to pybind11_tests.h, constructor_stats.h.

Author: rwgk

tests/constructor_stats.h

@@ -70,6 +70,11 @@ inspection/testing in python) by using the functions with `print_` replaced with
 #include <typeindex>
 #include <sstream>
 
+#if defined(__INTEL_COMPILER)
+#    pragma warning push
+#    pragma warning disable 2196 // warning #2196: routine is both "inline" and "noinline"
+#endif
+
 class ConstructorStats {
 protected:
     std::unordered_map<void*, int> _instances; // Need a map rather than set because members can shared address with parents
@@ -273,3 +278,7 @@ template <class T, typename... Values> void print_values(T *inst, Values &&...va
     print_constr_details(inst, ":", values...);
     track_values(inst, values...);
 }
+
+#if defined(__INTEL_COMPILER)
+#    pragma warning pop
+#endif

tests/pybind11_cross_module_tests.cpp

@@ -7,11 +7,6 @@
     BSD-style license that can be found in the LICENSE file.
 */
 
-#if defined(__INTEL_COMPILER)
-#    pragma warning push
-#    pragma warning disable 2196 // warning #2196: routine is both "inline" and "noinline"
-#endif
-
 #include "pybind11_tests.h"
 #include "local_bindings.h"
 #include "test_exceptions.h"
@@ -21,6 +16,11 @@
 #include <numeric>
 #include <utility>
 
+#if defined(__INTEL_COMPILER)
+#    pragma warning push
+#    pragma warning disable 2196 // warning #2196: routine is both "inline" and "noinline"
+#endif
+
 PYBIND11_MODULE(pybind11_cross_module_tests, m) {
     m.doc() = "pybind11 cross-module test module";
 

tests/pybind11_tests.cpp

@@ -7,17 +7,17 @@
     BSD-style license that can be found in the LICENSE file.
 */
 
-#if defined(__INTEL_COMPILER)
-#    pragma warning push
-#    pragma warning disable 2196 // warning #2196: routine is both "inline" and "noinline"
-#endif
-
 #include "pybind11_tests.h"
 #include "constructor_stats.h"
 
 #include <functional>
 #include <list>
 
+#if defined(__INTEL_COMPILER)
+#    pragma warning push
+#    pragma warning disable 2196 // warning #2196: routine is both "inline" and "noinline"
+#endif
+
 /*
 For testing purposes, we define a static global variable here in a function that each individual
 test .cpp calls with its initialization lambda.  It's convenient here because we can just not

tests/pybind11_tests.h

@@ -10,6 +10,9 @@
 // We get some really long type names here which causes MSVC 2015 to emit warnings
 #    pragma warning(                                                                              \
         disable : 4503) // warning C4503: decorated name length exceeded, name was truncated
+#elif defined(__INTEL_COMPILER)
+#    pragma warning push
+#    pragma warning disable 2196 // warning #2196: routine is both "inline" and "noinline"
 #endif
 
 namespace py = pybind11;
@@ -87,3 +90,9 @@ void ignoreOldStyleInitWarnings(F &&body) {
         body()
     )", py::dict(py::arg("body") = py::cpp_function(body)));
 }
+
+#if defined(_MSC_VER) && _MSC_VER < 1910
+#    pragma warning(pop)
+#elif defined(__INTEL_COMPILER)
+#    pragma warning pop
+#endif