diff --git a/attic/test_ert.cpp b/attic/test_ert.cpp index 9b9bd37c..e64517f2 100644 --- a/attic/test_ert.cpp +++ b/attic/test_ert.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -248,8 +248,8 @@ ecl_grid_type * create_ecl_grid( const struct UnstructuredGrid * g) { int main(int /*argc*/ , char **argv) { std::string filename( argv[1] ); - boost::scoped_ptr grid; - boost::scoped_ptr props; + const std::unique_ptr grid; + const std::unique_ptr props; Opm::EclipseGridParser eclParser(filename , false); //eclParser.saveEGRID_INIT("/tmp" , "OPM" ); diff --git a/examples/compute_tof.cpp b/examples/compute_tof.cpp index 7f5adc36..30b2c90f 100644 --- a/examples/compute_tof.cpp +++ b/examples/compute_tof.cpp @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include @@ -101,10 +101,10 @@ main(int argc, char** argv) // If we have a "deck_filename", grid and props will be read from that. bool use_deck = param.has("deck_filename"); - boost::scoped_ptr deck; - boost::scoped_ptr grid; - boost::scoped_ptr props; - boost::scoped_ptr wells; + std::unique_ptr deck; + std::unique_ptr grid; + std::unique_ptr props; + std::unique_ptr wells; TwophaseState state; // bool check_well_controls = false; // int max_well_control_iterations = 0; @@ -190,7 +190,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->c_grid(), param)); } else { diff --git a/examples/compute_tof_from_files.cpp b/examples/compute_tof_from_files.cpp index a6580c2f..8613cdfb 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/examples/sim_2p_comp_reorder.cpp b/examples/sim_2p_comp_reorder.cpp index 9e0b3de4..8613796f 100644 --- a/examples/sim_2p_comp_reorder.cpp +++ b/examples/sim_2p_comp_reorder.cpp @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include @@ -79,10 +79,10 @@ main(int argc, char** argv) // If we have a "deck_filename", grid and props will be read from that. bool use_deck = param.has("deck_filename"); - boost::scoped_ptr deck; - boost::scoped_ptr grid; - boost::scoped_ptr props; - boost::scoped_ptr rock_comp; + std::unique_ptr deck; + std::unique_ptr grid; + std::unique_ptr props; + std::unique_ptr rock_comp; BlackoilState state; // bool check_well_controls = false; // int max_well_control_iterations = 0; diff --git a/examples/sim_2p_incomp.cpp b/examples/sim_2p_incomp.cpp index 75fe2901..a9cccd39 100644 --- a/examples/sim_2p_incomp.cpp +++ b/examples/sim_2p_incomp.cpp @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include @@ -93,10 +93,10 @@ main(int argc, char** argv) // If we have a "deck_filename", grid and props will be read from that. bool use_deck = param.has("deck_filename"); - boost::scoped_ptr deck; - boost::scoped_ptr grid; - boost::scoped_ptr props; - boost::scoped_ptr rock_comp; + std::unique_ptr deck; + std::unique_ptr grid; + std::unique_ptr props; + std::unique_ptr rock_comp; TwophaseState state; // bool check_well_controls = false; // int max_well_control_iterations = 0; diff --git a/opm/core/props/BlackoilPropertiesFromDeck.hpp b/opm/core/props/BlackoilPropertiesFromDeck.hpp index 95c6c979..49072b29 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_; diff --git a/opm/core/simulator/SimulatorCompressibleTwophase.cpp b/opm/core/simulator/SimulatorCompressibleTwophase.cpp index f864fc93..974e809b 100644 --- a/opm/core/simulator/SimulatorCompressibleTwophase.cpp +++ b/opm/core/simulator/SimulatorCompressibleTwophase.cpp @@ -49,7 +49,7 @@ #include #include -#include +#include #include #include diff --git a/opm/core/simulator/SimulatorCompressibleTwophase.hpp b/opm/core/simulator/SimulatorCompressibleTwophase.hpp index 87027f7d..fc690ef5 100644 --- a/opm/core/simulator/SimulatorCompressibleTwophase.hpp +++ b/opm/core/simulator/SimulatorCompressibleTwophase.hpp @@ -90,7 +90,7 @@ namespace Opm private: class Impl; - // Using shared_ptr instead of scoped_ptr since scoped_ptr requires complete type for Impl. + // Using shared_ptr instead of unique_ptr since unique_ptr requires complete type for Impl. std::shared_ptr pimpl_; }; diff --git a/opm/core/simulator/SimulatorIncompTwophase.cpp b/opm/core/simulator/SimulatorIncompTwophase.cpp index efec518f..7377c8a1 100644 --- a/opm/core/simulator/SimulatorIncompTwophase.cpp +++ b/opm/core/simulator/SimulatorIncompTwophase.cpp @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include #include @@ -98,7 +98,7 @@ namespace Opm const FlowBoundaryConditions* bcs_; // Solvers IncompTpfa psolver_; - boost::scoped_ptr tsolver_; + std::unique_ptr tsolver_; // Misc. data std::vector allcells_; diff --git a/opm/core/simulator/SimulatorIncompTwophase.hpp b/opm/core/simulator/SimulatorIncompTwophase.hpp index 3b7e3ccf..b704dbf4 100644 --- a/opm/core/simulator/SimulatorIncompTwophase.hpp +++ b/opm/core/simulator/SimulatorIncompTwophase.hpp @@ -119,7 +119,7 @@ namespace Opm private: struct Impl; - // Using shared_ptr instead of scoped_ptr since scoped_ptr requires complete type for Impl. + // Using shared_ptr instead of unique_ptr since unique_ptr requires complete type for Impl. std::shared_ptr pimpl_; // implementation which is not templated, and can be in library diff --git a/opm/core/transport/implicit/TransportSolverTwophaseImplicit.hpp b/opm/core/transport/implicit/TransportSolverTwophaseImplicit.hpp index f077ed53..1a77401b 100644 --- a/opm/core/transport/implicit/TransportSolverTwophaseImplicit.hpp +++ b/opm/core/transport/implicit/TransportSolverTwophaseImplicit.hpp @@ -37,7 +37,7 @@ #include #include -#include +#include #include