OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #933 from atgeirr/silence-warnings

Browse Source 
Silence some warnings.
This commit is contained in:
Atgeirr Flø Rasmussen 2015-12-07 13:31:13 +01:00
commit e8ab4341f1
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
opm/core/grid/GridHelpers.hpp
View File

@ -20,8 +20,13 @@
*/ */
#ifndef OPM_CORE_GRIDHELPERS_HEADER_INCLUDED #ifndef OPM_CORE_GRIDHELPERS_HEADER_INCLUDED
#define OPM_CORE_GRIDHELPERS_HEADER_INCLUDED #define OPM_CORE_GRIDHELPERS_HEADER_INCLUDED
#include <opm/core/grid.h> #include <opm/core/grid.h>
#include <opm/common/utility/platform_dependent/disable_warnings.h>
#include <boost/range/iterator_range.hpp> #include <boost/range/iterator_range.hpp>
#include <opm/common/utility/platform_dependent/reenable_warnings.h>
namespace Opm namespace Opm
{ {

2
opm/core/utility/thresholdPressures.hpp
View File

@ -314,7 +314,7 @@ void computeMaxDp(std::map<std::pair<int, int>, double>& maxDp,
template <class Grid> template <class Grid>
std::vector<double> thresholdPressures(const DeckConstPtr& deck, std::vector<double> thresholdPressures(const DeckConstPtr& /* deck */,
EclipseStateConstPtr eclipseState, EclipseStateConstPtr eclipseState,
const Grid& grid, const Grid& grid,
const std::map<std::pair<int, int>, double>& maxDp) const std::map<std::pair<int, int>, double>& maxDp)