From c8649896f82ec4a4342a3fd44e732d7a2ae6548e Mon Sep 17 00:00:00 2001
From: Joakim Hove <joakim.hove@gmail.com>
Date: Tue, 6 Oct 2015 11:39:14 +0200
Subject: [PATCH] Relocated warning headers.

---
 opm/core/flowdiagnostics/AnisotropicEikonal.hpp | 4 ++--
 opm/core/grid/GridUtilities.cpp                 | 4 ++--
 opm/core/linalg/LinearSolverIstl.cpp            | 4 ++--
 opm/core/linalg/ParallelIstlInformation.hpp     | 4 ++--
 tests/DuneIstlTestHelpers.hpp                   | 4 ++--
 tests/test_anisotropiceikonal.cpp               | 4 ++--
 tests/test_regionmapping.cpp                    | 4 ++--
 tests/test_shadow.cpp                           | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/opm/core/flowdiagnostics/AnisotropicEikonal.hpp b/opm/core/flowdiagnostics/AnisotropicEikonal.hpp
index fc48c086..2e92256c 100644
--- a/opm/core/flowdiagnostics/AnisotropicEikonal.hpp
+++ b/opm/core/flowdiagnostics/AnisotropicEikonal.hpp
@@ -25,7 +25,7 @@
 #include <set>
 #include <map>
 
-#include <opm/core/utility/platform_dependent/disable_warnings.h>
+#include <opm/common/utility/platform_dependent/disable_warnings.h>
 
 #include <boost/version.hpp>
 
@@ -35,7 +35,7 @@
 #include <boost/heap/fibonacci_heap.hpp>
 #endif
 
-#include <opm/core/utility/platform_dependent/reenable_warnings.h>
+#include <opm/common/utility/platform_dependent/reenable_warnings.h>
 
 
 struct UnstructuredGrid;
diff --git a/opm/core/grid/GridUtilities.cpp b/opm/core/grid/GridUtilities.cpp
index eeec5eab..b653c3a2 100644
--- a/opm/core/grid/GridUtilities.cpp
+++ b/opm/core/grid/GridUtilities.cpp
@@ -20,9 +20,9 @@
 #include <opm/core/grid/GridUtilities.hpp>
 #include <opm/core/grid/GridHelpers.hpp>
 
-#include <opm/core/utility/platform_dependent/disable_warnings.h>
+#include <opm/common/utility/platform_dependent/disable_warnings.h>
 #include <boost/math/constants/constants.hpp>
-#include <opm/core/utility/platform_dependent/reenable_warnings.h>
+#include <opm/common/utility/platform_dependent/reenable_warnings.h>
 
 #include <set>
 #include <vector>
diff --git a/opm/core/linalg/LinearSolverIstl.cpp b/opm/core/linalg/LinearSolverIstl.cpp
index eb3a8457..fa8bf115 100644
--- a/opm/core/linalg/LinearSolverIstl.cpp
+++ b/opm/core/linalg/LinearSolverIstl.cpp
@@ -30,7 +30,7 @@
 // the deprecated member anyway (in this compilation unit)
 #define DUNE_COMMON_FIELDVECTOR_SIZE_IS_METHOD 1
 
-#include <opm/core/utility/platform_dependent/disable_warnings.h>
+#include <opm/common/utility/platform_dependent/disable_warnings.h>
 
 // TODO: clean up includes.
 #include <dune/common/deprecated.hh>
@@ -51,7 +51,7 @@
 #include <dune/istl/paamg/fastamg.hh>
 #endif
 
-#include <opm/core/utility/platform_dependent/reenable_warnings.h>
+#include <opm/common/utility/platform_dependent/reenable_warnings.h>
 
 #include <stdexcept>
 #include <iostream>
diff --git a/opm/core/linalg/ParallelIstlInformation.hpp b/opm/core/linalg/ParallelIstlInformation.hpp
index aceaad59..7a2ac3d2 100644
--- a/opm/core/linalg/ParallelIstlInformation.hpp
+++ b/opm/core/linalg/ParallelIstlInformation.hpp
@@ -29,13 +29,13 @@
 
 #if HAVE_MPI && HAVE_DUNE_ISTL
 
-#include <opm/core/utility/platform_dependent/disable_warnings.h>
+#include <opm/common/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>
 #include <dune/common/enumset.hh>
-#include <opm/core/utility/platform_dependent/reenable_warnings.h>
+#include <opm/common/utility/platform_dependent/reenable_warnings.h>
 
 #include <algorithm>
 #include <functional>
diff --git a/tests/DuneIstlTestHelpers.hpp b/tests/DuneIstlTestHelpers.hpp
index b67dfc52..2d09c048 100644
--- a/tests/DuneIstlTestHelpers.hpp
+++ b/tests/DuneIstlTestHelpers.hpp
@@ -20,7 +20,7 @@
 #ifndef OPM_DUNEISTLTESTHELPERS_HEADER
 #define OPM_DUNEISTLTESTHELPERS_HEADER
 
-#include <opm/core/utility/platform_dependent/disable_warnings.h>
+#include <opm/common/utility/platform_dependent/disable_warnings.h>
 
 // MPI header
 #if HAVE_MPI
@@ -43,7 +43,7 @@
 #include <dune/common/parallel/remoteindices.hh>
 #include <dune/istl/owneroverlapcopy.hh>
 
-#include <opm/core/utility/platform_dependent/reenable_warnings.h>
+#include <opm/common/utility/platform_dependent/reenable_warnings.h>
 
 #include <tuple>
 
diff --git a/tests/test_anisotropiceikonal.cpp b/tests/test_anisotropiceikonal.cpp
index 82f3459d..85a75322 100644
--- a/tests/test_anisotropiceikonal.cpp
+++ b/tests/test_anisotropiceikonal.cpp
@@ -26,9 +26,9 @@
 
 #define BOOST_TEST_MODULE AnisotropicEikonalTest
 
-#include <opm/core/utility/platform_dependent/disable_warnings.h>
+#include <opm/common/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
-#include <opm/core/utility/platform_dependent/reenable_warnings.h>
+#include <opm/common/utility/platform_dependent/reenable_warnings.h>
 
 #include <opm/core/flowdiagnostics/AnisotropicEikonal.hpp>
 #include <opm/core/grid/GridManager.hpp>
diff --git a/tests/test_regionmapping.cpp b/tests/test_regionmapping.cpp
index 75eb0318..760a719f 100644
--- a/tests/test_regionmapping.cpp
+++ b/tests/test_regionmapping.cpp
@@ -28,9 +28,9 @@
 
 #define BOOST_TEST_MODULE RegionMapping
 
-#include <opm/core/utility/platform_dependent/disable_warnings.h>
+#include <opm/common/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
-#include <opm/core/utility/platform_dependent/reenable_warnings.h>
+#include <opm/common/utility/platform_dependent/reenable_warnings.h>
 
 /* --- our own headers --- */
 
diff --git a/tests/test_shadow.cpp b/tests/test_shadow.cpp
index b429eb49..50fdecb3 100644
--- a/tests/test_shadow.cpp
+++ b/tests/test_shadow.cpp
@@ -8,9 +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 <opm/common/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
-#include <opm/core/utility/platform_dependent/reenable_warnings.h>
+#include <opm/common/utility/platform_dependent/reenable_warnings.h>
 
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/props/IncompPropertiesBasic.hpp>