From 5216550cdfeeeef6036593aae04ce74c2cc32700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Mon, 10 Aug 2015 16:07:45 +0200
Subject: [PATCH] Suppress warnings.

---
 opm/core/flowdiagnostics/AnisotropicEikonal.hpp | 5 +++++
 opm/core/linalg/ParallelIstlInformation.hpp     | 2 +-
 tests/DuneIstlTestHelpers.hpp                   | 5 +++--
 tests/test_anisotropiceikonal.cpp               | 3 +++
 tests/test_parallel_linearsolver.cpp            | 2 --
 tests/test_parallelistlinformation.cpp          | 5 -----
 tests/test_shadow.cpp                           | 2 ++
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/opm/core/flowdiagnostics/AnisotropicEikonal.hpp b/opm/core/flowdiagnostics/AnisotropicEikonal.hpp
index 798869adc..fc48c0864 100644
--- a/opm/core/flowdiagnostics/AnisotropicEikonal.hpp
+++ b/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
diff --git a/opm/core/linalg/ParallelIstlInformation.hpp b/opm/core/linalg/ParallelIstlInformation.hpp
index 770411b55..aceaad590 100644
--- a/opm/core/linalg/ParallelIstlInformation.hpp
+++ b/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>
diff --git a/tests/DuneIstlTestHelpers.hpp b/tests/DuneIstlTestHelpers.hpp
index 6563fe34b..b67dfc52f 100644
--- a/tests/DuneIstlTestHelpers.hpp
+++ b/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>
diff --git a/tests/test_anisotropiceikonal.cpp b/tests/test_anisotropiceikonal.cpp
index 4a3786426..82f3459da 100644
--- a/tests/test_anisotropiceikonal.cpp
+++ b/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>
diff --git a/tests/test_parallel_linearsolver.cpp b/tests/test_parallel_linearsolver.cpp
index 63d2b1cb2..39490bc1a 100644
--- a/tests/test_parallel_linearsolver.cpp
+++ b/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!"
diff --git a/tests/test_parallelistlinformation.cpp b/tests/test_parallelistlinformation.cpp
index 6066aceb5..6bd927008 100644
--- a/tests/test_parallelistlinformation.cpp
+++ b/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>
diff --git a/tests/test_shadow.cpp b/tests/test_shadow.cpp
index f41b32775..b429eb49f 100644
--- a/tests/test_shadow.cpp
+++ b/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>