From e6a2f2655a1b2877035f17021a10f386977f422e Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Thu, 8 Aug 2013 15:21:38 +0200 Subject: [PATCH] replace boost::scoped_ptr by std::unique_ptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit thanks to Bård Skaflestad, Atgeirr Rasmusen and Roland Kaufmann for the hint. --- examples/compute_tof_from_files.cpp | 4 ++-- opm/core/props/BlackoilPropertiesFromDeck.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/compute_tof_from_files.cpp b/examples/compute_tof_from_files.cpp index a6580c2f8..8613cdfbb 100644 --- a/examples/compute_tof_from_files.cpp +++ b/examples/compute_tof_from_files.cpp @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include @@ -142,7 +142,7 @@ main(int argc, char** argv) bool use_dg = param.getDefault("use_dg", false); bool use_multidim_upwind = false; // Need to initialize dg solver here, since it uses parameters now. - boost::scoped_ptr dg_solver; + std::unique_ptr dg_solver; if (use_dg) { dg_solver.reset(new Opm::TofDiscGalReorder(grid, param)); } else { diff --git a/opm/core/props/BlackoilPropertiesFromDeck.hpp b/opm/core/props/BlackoilPropertiesFromDeck.hpp index 95c6c9795..49072b29e 100644 --- a/opm/core/props/BlackoilPropertiesFromDeck.hpp +++ b/opm/core/props/BlackoilPropertiesFromDeck.hpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include struct UnstructuredGrid; @@ -186,7 +186,7 @@ namespace Opm private: RockFromDeck rock_; BlackoilPvtProperties pvt_; - boost::scoped_ptr satprops_; + std::unique_ptr satprops_; mutable std::vector B_; mutable std::vector dB_; mutable std::vector R_;