Suppress warnings.

This commit is contained in:
Atgeirr Flø Rasmussen 2015-08-10 16:07:45 +02:00
parent 9c8460d471
commit 5216550cdf
7 changed files with 14 additions and 10 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -28,11 +28,6 @@
#define BOOST_TEST_MODULE OPM-ParallelIstlInformation #define BOOST_TEST_MODULE OPM-ParallelIstlInformation
#include <boost/test/unit_test.hpp> #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 "DuneIstlTestHelpers.hpp"
#include <opm/core/linalg/ParallelIstlInformation.hpp> #include <opm/core/linalg/ParallelIstlInformation.hpp>
#include <functional> #include <functional>

View File

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