Merge pull request #4 from atgeirr/cleanup-output-writers-extra

Remove pessimizing move and silence warnings.
This commit is contained in:
dr-robertk 2017-02-14 11:08:15 +01:00 committed by GitHub
commit 22cbaeea62
2 changed files with 4 additions and 4 deletions

View File

@ -1315,7 +1315,7 @@ namespace Opm {
} }
} }
return std::move(simData); return simData;
} }
const FIPDataType& getFIPData() const { const FIPDataType& getFIPData() const {

View File

@ -516,7 +516,7 @@ namespace Opm
addToSimData( simData, "RSSAT", sd.rsSat ); addToSimData( simData, "RSSAT", sd.rsSat );
addToSimData( simData, "RVSAT", sd.rvSat ); addToSimData( simData, "RVSAT", sd.rvSat );
return std::move( simData ); return simData;
} }
// in case the data is already in a SimulationDataContainer no // in case the data is already in a SimulationDataContainer no
@ -536,8 +536,8 @@ namespace Opm
template<class Model> template<class Model>
void getRestartData(data::Solution& output, void getRestartData(data::Solution& output,
SimulationDataContainer&& sd, SimulationDataContainer&& sd,
const Opm::PhaseUsage& phaseUsage, const Opm::PhaseUsage& /* phaseUsage */,
const Model& physicalModel, const Model& /* physicalModel */,
const RestartConfig& restartConfig, const RestartConfig& restartConfig,
const int reportStepNum, const int reportStepNum,
const bool log) const bool log)