Use new location of warning suppression header.

This commit is contained in:
Atgeirr Flø Rasmussen
2014-09-20 10:39:34 +02:00
parent fa5d725bc3
commit 25c9b36d4f
8 changed files with 16 additions and 16 deletions
+2 -2
View File
@@ -25,7 +25,7 @@
#include <dune/common/version.hh> #include <dune/common/version.hh>
#include "disable_warning_pragmas.h" #include <opm/core/utility/platform_dependent/disable_warnings.h>
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3) #if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
#include <dune/common/parallel/mpihelper.hh> #include <dune/common/parallel/mpihelper.hh>
@@ -35,7 +35,7 @@
#include <dune/grid/CpGrid.hpp> #include <dune/grid/CpGrid.hpp>
#include <dune/grid/common/GridAdapter.hpp> #include <dune/grid/common/GridAdapter.hpp>
#include "reenable_warning_pragmas.h" #include <opm/core/utility/platform_dependent/reenable_warnings.h>
#include <opm/core/pressure/FlowBCManager.hpp> #include <opm/core/pressure/FlowBCManager.hpp>
+2 -2
View File
@@ -20,12 +20,12 @@
#ifndef OPM_AUTODIFFBLOCK_HEADER_INCLUDED #ifndef OPM_AUTODIFFBLOCK_HEADER_INCLUDED
#define OPM_AUTODIFFBLOCK_HEADER_INCLUDED #define OPM_AUTODIFFBLOCK_HEADER_INCLUDED
#include "disable_warning_pragmas.h" #include <opm/core/utility/platform_dependent/disable_warnings.h>
#include <Eigen/Eigen> #include <Eigen/Eigen>
#include <Eigen/Sparse> #include <Eigen/Sparse>
#include "reenable_warning_pragmas.h" #include <opm/core/utility/platform_dependent/reenable_warnings.h>
#include <vector> #include <vector>
#include <cassert> #include <cassert>
+2 -2
View File
@@ -35,9 +35,9 @@
#include <vector> #include <vector>
#ifdef HAVE_DUNE_CORNERPOINT #ifdef HAVE_DUNE_CORNERPOINT
#include "disable_warning_pragmas.h" #include <opm/core/utility/platform_dependent/disable_warnings.h>
#include <dune/grid/CpGrid.hpp> #include <dune/grid/CpGrid.hpp>
#include "reenable_warning_pragmas.h" #include <opm/core/utility/platform_dependent/reenable_warnings.h>
#endif #endif
namespace Opm namespace Opm
+2 -2
View File
@@ -23,7 +23,7 @@
#include <memory> #include <memory>
#include "disable_warning_pragmas.h" #include <opm/core/utility/platform_dependent/disable_warnings.h>
#include <dune/istl/bvector.hh> #include <dune/istl/bvector.hh>
#include <dune/istl/bcrsmatrix.hh> #include <dune/istl/bcrsmatrix.hh>
@@ -37,7 +37,7 @@
#include <dune/istl/paamg/kamg.hh> #include <dune/istl/paamg/kamg.hh>
#include <dune/istl/paamg/pinfo.hh> #include <dune/istl/paamg/pinfo.hh>
#include "reenable_warning_pragmas.h" #include <opm/core/utility/platform_dependent/reenable_warnings.h>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
+2 -2
View File
@@ -28,7 +28,7 @@
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include "disable_warning_pragmas.h" #include <opm/core/utility/platform_dependent/disable_warnings.h>
#include <Eigen/Eigen> #include <Eigen/Eigen>
@@ -38,7 +38,7 @@
#include <dune/grid/common/mcmgmapper.hh> #include <dune/grid/common/mcmgmapper.hh>
#endif #endif
#include "reenable_warning_pragmas.h" #include <opm/core/utility/platform_dependent/reenable_warnings.h>
#include <cstddef> #include <cstddef>
+2 -2
View File
@@ -26,7 +26,7 @@
#include <opm/core/grid.h> #include <opm/core/grid.h>
#include <opm/core/grid/GridHelpers.hpp> #include <opm/core/grid/GridHelpers.hpp>
#include "disable_warning_pragmas.h" #include <opm/core/utility/platform_dependent/disable_warnings.h>
#include <Eigen/Eigen> #include <Eigen/Eigen>
#include <Eigen/Sparse> #include <Eigen/Sparse>
@@ -35,7 +35,7 @@
#include <dune/grid/CpGrid.hpp> #include <dune/grid/CpGrid.hpp>
#endif #endif
#include "reenable_warning_pragmas.h" #include <opm/core/utility/platform_dependent/reenable_warnings.h>
namespace Opm namespace Opm
+2 -2
View File
@@ -26,7 +26,7 @@
#include <opm/core/utility/Units.hpp> #include <opm/core/utility/Units.hpp>
#include <opm/core/linalg/LinearSolverFactory.hpp> #include <opm/core/linalg/LinearSolverFactory.hpp>
#include "disable_warning_pragmas.h" #include <opm/core/utility/platform_dependent/disable_warnings.h>
#include <dune/istl/bvector.hh> #include <dune/istl/bvector.hh>
#include <dune/istl/bcrsmatrix.hh> #include <dune/istl/bcrsmatrix.hh>
@@ -40,7 +40,7 @@
#include <dune/istl/paamg/kamg.hh> #include <dune/istl/paamg/kamg.hh>
#include <dune/istl/paamg/pinfo.hh> #include <dune/istl/paamg/pinfo.hh>
#include "reenable_warning_pragmas.h" #include <opm/core/utility/platform_dependent/reenable_warnings.h>
namespace Opm namespace Opm
@@ -16,10 +16,10 @@
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#ifdef HAVE_DUNE_CORNERPOINT #ifdef HAVE_DUNE_CORNERPOINT
#include "disable_warning_pragmas.h" #include <opm/core/utility/platform_dependent/disable_warnings.h>
#include <dune/common/version.hh> #include <dune/common/version.hh>
#include <dune/grid/io/file/vtk/vtkwriter.hh> #include <dune/grid/io/file/vtk/vtkwriter.hh>
#include "reenable_warning_pragmas.h" #include <opm/core/utility/platform_dependent/reenable_warnings.h>
#endif #endif
namespace Opm namespace Opm
{ {