OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

replace boost::scoped_ptr by std::unique_ptr

Browse Source 
thanks to Bård Skaflestad, Atgeirr Rasmusen and Roland Kaufmann for
the hint.
This commit is contained in:
Andreas Lauser
2013-08-08 15:21:38 +02:00
parent 5cd622fbf7
commit e6a2f2655a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/compute_tof_from_files.cpp
View File

@@ -46,7 +46,7 @@
#include <opm/core/tof/TofReorder.hpp> #include <opm/core/tof/TofReorder.hpp>
#include <opm/core/tof/TofDiscGalReorder.hpp> #include <opm/core/tof/TofDiscGalReorder.hpp>
#include <boost/scoped_ptr.hpp> #include <memory>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <algorithm> #include <algorithm>
@@ -142,7 +142,7 @@ main(int argc, char** argv)
bool use_dg = param.getDefault("use_dg", false); bool use_dg = param.getDefault("use_dg", false);
bool use_multidim_upwind = false; bool use_multidim_upwind = false;
// Need to initialize dg solver here, since it uses parameters now. // Need to initialize dg solver here, since it uses parameters now.
boost::scoped_ptr<Opm::TofDiscGalReorder> dg_solver; std::unique_ptr<Opm::TofDiscGalReorder> dg_solver;
if (use_dg) { if (use_dg) {
dg_solver.reset(new Opm::TofDiscGalReorder(grid, param)); dg_solver.reset(new Opm::TofDiscGalReorder(grid, param));
} else { } else {

4
opm/core/props/BlackoilPropertiesFromDeck.hpp
View File

@@ -27,7 +27,7 @@
#include <opm/core/props/satfunc/SaturationPropsFromDeck.hpp> #include <opm/core/props/satfunc/SaturationPropsFromDeck.hpp>
#include <opm/core/io/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp> #include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <boost/scoped_ptr.hpp> #include <memory>
struct UnstructuredGrid; struct UnstructuredGrid;
@@ -186,7 +186,7 @@ namespace Opm
private: private:
RockFromDeck rock_; RockFromDeck rock_;
BlackoilPvtProperties pvt_; BlackoilPvtProperties pvt_;
boost::scoped_ptr<SaturationPropsInterface> satprops_; std::unique_ptr<SaturationPropsInterface> satprops_;
mutable std::vector<double> B_; mutable std::vector<double> B_;
mutable std::vector<double> dB_; mutable std::vector<double> dB_;
mutable std::vector<double> R_; mutable std::vector<double> R_;