Fix pop without push for older clang

Author: mborland

include/boost/numeric/odeint/algebra/multi_array_algebra.hpp

@@ -152,9 +152,9 @@ struct algebra_dispatcher< boost::multi_array< T , N > >
 } // namespace numeric
 } // namespace boost
 
-#if defined(__clang__)
+#if defined(__clang__) && __clang_major__ >= 10
 #pragma clang diagnostic pop
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) && __GNUC__ >= 9
 #pragma GCC diagnostic pop
 #elif defined(_MSC_VER)
 #pragma warning(pop)

include/boost/numeric/odeint/stepper/adams_bashforth_moulton.hpp

@@ -320,9 +320,9 @@ public :
 } // numeric
 } // boost
 
-#if defined(__clang__)
+#if defined(__clang__) && __clang_major__ >= 10
 #pragma clang diagnostic pop
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) && __GNUC__ >= 9
 #pragma GCC diagnostic pop
 #elif defined(_MSC_VER)
 #pragma warning(pop)

include/boost/numeric/odeint/stepper/rosenbrock4.hpp

@@ -354,9 +354,9 @@ class rosenbrock4
 } // namespace numeric
 } // namespace boost
 
-#if defined(__clang__)
+#if defined(__clang__) && __clang_major__ >= 10
 #pragma clang diagnostic pop
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) && __GNUC__ >= 9
 #pragma GCC diagnostic pop
 #elif defined(_MSC_VER)
 #pragma warning(pop)

include/boost/numeric/odeint/util/ublas_wrapper.hpp

@@ -304,9 +304,9 @@ struct state_wrapper< boost::numeric::ublas::permutation_matrix< T , A > > // wi
 
 } } }
 
-#if defined(__clang__)
+#if defined(__clang__) && __clang_major__ >= 10
 #pragma clang diagnostic pop
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) && __GNUC__ >= 9
 #pragma GCC diagnostic pop
 #elif defined(_MSC_VER)
 #pragma warning(pop)

test/integrate_implicit.cpp

@@ -244,9 +244,9 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( integrate_n_steps_test_case , Stepper, simple_ste
 
 BOOST_AUTO_TEST_SUITE_END()
 
-#if defined(__clang__)
+#if defined(__clang__) && __clang_major__ >= 10
 #pragma clang diagnostic pop
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) && __GNUC__ >= 9
 #pragma GCC diagnostic pop
 #elif defined(_MSC_VER)
 #pragma warning(pop)

test/is_resizeable.cpp

@@ -126,9 +126,9 @@ BOOST_AUTO_TEST_CASE( test_my_seq2 )
     BOOST_CHECK( is_resizeable< my_seq2< double > >::value );
 }
 
-#if defined(__clang__)
+#if defined(__clang__) && __clang_major__ >= 10
 #pragma clang diagnostic pop
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) && __GNUC__ >= 9
 #pragma GCC diagnostic pop
 #elif defined(_MSC_VER)
 #pragma warning(pop)

test/numeric/order_quadrature_formula.cpp

@@ -203,9 +203,9 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( adams_bashforth_moultion_test , Stepper, abm_step
 
 BOOST_AUTO_TEST_SUITE_END()
 
-#if defined(__clang__)
+#if defined(__clang__) && __clang_major__ >= 10
 #pragma clang diagnostic pop
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) && __GNUC__ >= 9
 #pragma GCC diagnostic pop
 #elif defined(_MSC_VER)
 #pragma warning(pop)

test/runge_kutta_concepts.cpp

@@ -227,9 +227,9 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( stepper_test2 , Stepper, stepper_combinations2 )
 
 BOOST_AUTO_TEST_SUITE_END()
 
-#if defined(__clang__)
+#if defined(__clang__) && __clang_major__ >= 10
 #pragma clang diagnostic pop
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) && __GNUC__ >= 9
 #pragma GCC diagnostic pop
 #elif defined(_MSC_VER)
 #pragma warning(pop)