Suppress warnings.

opm/core/flowdiagnostics/AnisotropicEikonal.hpp

@@ -25,6 +25,8 @@
 #include <set>
 #include <map>
 
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
+
 #include <boost/version.hpp>
 
 #define BOOST_HEAP_AVAILABLE ((BOOST_VERSION / 100 % 1000) >= 49)
@@ -33,6 +35,9 @@
 #include <boost/heap/fibonacci_heap.hpp>
 #endif
 
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
+
+
 struct UnstructuredGrid;
 
 namespace Opm

opm/core/grid/GridUtilities.cpp

@@ -19,7 +19,11 @@
 
 #include <opm/core/grid/GridUtilities.hpp>
 #include <opm/core/grid/GridHelpers.hpp>
+
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
 #include <boost/math/constants/constants.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
+
 #include <set>
 #include <vector>
 #include <cmath>

opm/core/linalg/ParallelIstlInformation.hpp

@@ -28,9 +28,9 @@
 #include <exception>
 
 #if HAVE_MPI && HAVE_DUNE_ISTL
-#include <mpi.h>
 
 #include <opm/core/utility/platform_dependent/disable_warnings.h>
+#include <mpi.h>
 #include <dune/istl/owneroverlapcopy.hh>
 #include <dune/common/parallel/interface.hh>
 #include <dune/common/parallel/communicator.hh>

tests/DuneIstlTestHelpers.hpp

@@ -19,6 +19,9 @@
 */
 #ifndef OPM_DUNEISTLTESTHELPERS_HEADER
 #define OPM_DUNEISTLTESTHELPERS_HEADER
+
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
+
 // MPI header
 #if HAVE_MPI
 #include <mpi.h>
@@ -26,8 +29,6 @@
 #error "This file needs to compiled with MPI support!"
 #endif
 
-#include <opm/core/utility/platform_dependent/disable_warnings.h>
-
 #include <dune/common/version.hh>
 #if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpicollectivecommunication.hh>

tests/test_anisotropiceikonal.cpp

@@ -25,7 +25,10 @@
 #define NVERBOSE // to suppress our messages when throwing
 
 #define BOOST_TEST_MODULE AnisotropicEikonalTest
+
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 #include <opm/core/flowdiagnostics/AnisotropicEikonal.hpp>
 #include <opm/core/grid/GridManager.hpp>

tests/test_parallel_linearsolver.cpp

@@ -29,9 +29,7 @@
 
 // MPI header
 #if HAVE_MPI
-#include <mpi.h>
 #include <dune/common/version.hh>
-
 #include <opm/core/linalg/ParallelIstlInformation.hpp>
 #else
 #error "This file needs to compiled with MPI support!"

tests/test_parallelistlinformation.cpp

@@ -28,11 +28,6 @@
 
 #define BOOST_TEST_MODULE OPM-ParallelIstlInformation
 #include <boost/test/unit_test.hpp>
-#if HAVE_MPI
-#include <mpi.h>
-#else
-#error "This file needs to compiled with MPI support!"
-#endif
 #include "DuneIstlTestHelpers.hpp"
 #include <opm/core/linalg/ParallelIstlInformation.hpp>
 #include <functional>

tests/test_regionmapping.cpp

@@ -27,8 +27,11 @@
 #define NVERBOSE  // Suppress own messages when throw()ing
 
 #define BOOST_TEST_MODULE UnitsTest
+
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 /* --- our own headers --- */
 

tests/test_shadow.cpp

@@ -8,7 +8,9 @@
 #define NVERBOSE // to suppress our messages when throwing
 
 #define BOOST_TEST_MODULE ShadowTest
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/props/IncompPropertiesBasic.hpp>

tests/test_sparsetable.cpp

@@ -76,7 +76,7 @@ BOOST_AUTO_TEST_CASE(construction_and_queries)
     BOOST_CHECK_EQUAL(st2.rowSize(1), 0);
     BOOST_CHECK_EQUAL(st2[3][1], 4);
     BOOST_CHECK_EQUAL(st2[4][2], 9);
-    BOOST_CHECK(st2[4].size() == rowsizes[4]);
+    BOOST_CHECK(int(st2[4].size()) == rowsizes[4]);
     const SparseTable<int> st2_again(elem, elem + num_elem, rowsizes, rowsizes + num_rows);
     BOOST_CHECK(st2 == st2_again);
     SparseTable<int> st2_byassign;