From 7090b58f035ada55c57533d62ae7986dfba28d5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= Date: Fri, 4 Sep 2015 15:04:13 +0200 Subject: [PATCH] Mark non-template functions in headers as 'inline' --- opm/core/simulator/EquilibrationHelpers.hpp | 6 +++--- opm/core/simulator/initStateEquil_impl.hpp | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/opm/core/simulator/EquilibrationHelpers.hpp b/opm/core/simulator/EquilibrationHelpers.hpp index 16095f44a..2ea49e59e 100644 --- a/opm/core/simulator/EquilibrationHelpers.hpp +++ b/opm/core/simulator/EquilibrationHelpers.hpp @@ -887,9 +887,9 @@ namespace Opm } /// Return true if capillary pressure function is constant - bool isConstPc(const BlackoilPropertiesInterface& props, - const int phase, - const int cell) + inline bool isConstPc(const BlackoilPropertiesInterface& props, + const int phase, + const int cell) { // Find minimum and maximum saturations. double sminarr[BlackoilPhases::MaxNumPhases]; diff --git a/opm/core/simulator/initStateEquil_impl.hpp b/opm/core/simulator/initStateEquil_impl.hpp index aa138126d..af25b15a6 100644 --- a/opm/core/simulator/initStateEquil_impl.hpp +++ b/opm/core/simulator/initStateEquil_impl.hpp @@ -777,7 +777,8 @@ namespace Opm /// Convert saturations from a vector of individual phase saturation vectors /// to an interleaved format where all values for a given cell come before all /// values for the next cell, all in a single vector. - std::vector convertSats(const std::vector< std::vector >& sat) + inline std::vector + convertSats(const std::vector< std::vector >& sat) { const int np = sat.size(); const int nc = sat[0].size();