diff --git a/opm/material/fluidsystems/blackoilpvt/WaterPvtMultiplexer.hpp b/opm/material/fluidsystems/blackoilpvt/WaterPvtMultiplexer.hpp index a1f94bf9c..f6e4f865c 100644 --- a/opm/material/fluidsystems/blackoilpvt/WaterPvtMultiplexer.hpp +++ b/opm/material/fluidsystems/blackoilpvt/WaterPvtMultiplexer.hpp @@ -193,7 +193,7 @@ public: break; case WaterPvtApproach::ThermalWaterPvt: - realWaterPvt_ = new WaterPvtThermal; + realWaterPvt_ = new WaterPvtThermal; break; case WaterPvtApproach::NoWaterPvt: @@ -241,17 +241,17 @@ public: } template - typename std::enable_if >::type& getRealPvt() + typename std::enable_if >::type& getRealPvt() { assert(approach() == approachV); - return *static_cast* >(realWaterPvt_); + return *static_cast* >(realWaterPvt_); } template - typename std::enable_if >::type& getRealPvt() const + typename std::enable_if >::type& getRealPvt() const { assert(approach() == approachV); - return *static_cast* >(realWaterPvt_); + return *static_cast* >(realWaterPvt_); } const void* realWaterPvt() const { return realWaterPvt_; } @@ -269,8 +269,8 @@ public: return *static_cast*>(realWaterPvt_) == *static_cast*>(data.realWaterPvt_); case WaterPvtApproach::ThermalWaterPvt: - return *static_cast*>(realWaterPvt_) == - *static_cast*>(data.realWaterPvt_); + return *static_cast*>(realWaterPvt_) == + *static_cast*>(data.realWaterPvt_); default: return true; } @@ -287,7 +287,7 @@ public: realWaterPvt_ = new ConstantCompressibilityBrinePvt(*static_cast*>(data.realWaterPvt_)); break; case WaterPvtApproach::ThermalWaterPvt: - realWaterPvt_ = new WaterPvtThermal(*static_cast*>(data.realWaterPvt_)); + realWaterPvt_ = new WaterPvtThermal(*static_cast*>(data.realWaterPvt_)); break; default: break; diff --git a/opm/material/fluidsystems/blackoilpvt/WaterPvtThermal.hpp b/opm/material/fluidsystems/blackoilpvt/WaterPvtThermal.hpp index 7834ce4b3..bc43ffc58 100644 --- a/opm/material/fluidsystems/blackoilpvt/WaterPvtThermal.hpp +++ b/opm/material/fluidsystems/blackoilpvt/WaterPvtThermal.hpp @@ -50,12 +50,12 @@ class WaterPvtMultiplexer; * Note that this _only_ implements the temperature part, i.e., it requires the * isothermal properties as input. */ -template +template class WaterPvtThermal { public: typedef Tabulated1DFunction TabulatedOneDFunction; - typedef WaterPvtMultiplexer IsothermalPvt; + typedef WaterPvtMultiplexer IsothermalPvt; WaterPvtThermal() { @@ -344,7 +344,7 @@ public: bool enableInternalEnergy() const { return enableInternalEnergy_; } - bool operator==(const WaterPvtThermal& data) const + bool operator==(const WaterPvtThermal& data) const { if (isothermalPvt_ && !data.isothermalPvt_) return false; @@ -369,7 +369,7 @@ public: this->enableInternalEnergy() == data.enableInternalEnergy(); } - WaterPvtThermal& operator=(const WaterPvtThermal& data) + WaterPvtThermal& operator=(const WaterPvtThermal& data) { if (data.isothermalPvt_) isothermalPvt_ = new IsothermalPvt(*data.isothermalPvt_);