replace boost::scoped_ptr by std::unique_ptr

thanks to Bård Skaflestad, Atgeirr Rasmusen and Roland Kaufmann for
the hint.

attic/test_ert.cpp

@@ -24,7 +24,7 @@
 #include <opm/core/grid/cart_grid.h>
 #include <opm/core/grid.h>
 #include <cstdio>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <opm/core/props/IncompPropertiesBasic.hpp>
 #include <opm/core/props/IncompPropertiesFromDeck.hpp>
 
@@ -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<Opm::GridManager> grid;
-  boost::scoped_ptr<Opm::IncompPropertiesInterface> props;
+  const std::unique_ptr<Opm::GridManager> grid;
+  const std::unique_ptr<Opm::IncompPropertiesInterface> props;
   Opm::EclipseGridParser eclParser(filename , false);
 
   //eclParser.saveEGRID_INIT("/tmp" , "OPM" );

examples/compute_tof.cpp

@@ -47,7 +47,7 @@
 #include <opm/core/tof/TofReorder.hpp>
 #include <opm/core/tof/TofDiscGalReorder.hpp>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <boost/filesystem.hpp>
 
 #include <algorithm>
@@ -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<EclipseGridParser> deck;
-    boost::scoped_ptr<GridManager> grid;
-    boost::scoped_ptr<IncompPropertiesInterface> props;
-    boost::scoped_ptr<Opm::WellsManager> wells;
+    std::unique_ptr<EclipseGridParser> deck;
+    std::unique_ptr<GridManager> grid;
+    std::unique_ptr<IncompPropertiesInterface> props;
+    std::unique_ptr<Opm::WellsManager> 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<Opm::TofDiscGalReorder> dg_solver;
+    std::unique_ptr<Opm::TofDiscGalReorder> dg_solver;
     if (use_dg) {
         dg_solver.reset(new Opm::TofDiscGalReorder(*grid->c_grid(), param));
     } else {

examples/compute_tof_from_files.cpp

@@ -46,7 +46,7 @@
 #include <opm/core/tof/TofReorder.hpp>
 #include <opm/core/tof/TofDiscGalReorder.hpp>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <boost/filesystem.hpp>
 
 #include <algorithm>
@@ -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<Opm::TofDiscGalReorder> dg_solver;
+    std::unique_ptr<Opm::TofDiscGalReorder> dg_solver;
     if (use_dg) {
         dg_solver.reset(new Opm::TofDiscGalReorder(grid, param));
     } else {

examples/sim_2p_comp_reorder.cpp

@@ -44,7 +44,7 @@
 #include <opm/core/simulator/WellState.hpp>
 #include <opm/core/simulator/SimulatorCompressibleTwophase.hpp>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <boost/filesystem.hpp>
 
 #include <algorithm>
@@ -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<EclipseGridParser> deck;
-    boost::scoped_ptr<GridManager> grid;
-    boost::scoped_ptr<BlackoilPropertiesInterface> props;
-    boost::scoped_ptr<RockCompressibility> rock_comp;
+    std::unique_ptr<EclipseGridParser> deck;
+    std::unique_ptr<GridManager> grid;
+    std::unique_ptr<BlackoilPropertiesInterface> props;
+    std::unique_ptr<RockCompressibility> rock_comp;
     BlackoilState state;
     // bool check_well_controls = false;
     // int max_well_control_iterations = 0;

examples/sim_2p_incomp.cpp

@@ -45,7 +45,7 @@
 #include <opm/core/simulator/WellState.hpp>
 #include <opm/core/simulator/SimulatorIncompTwophase.hpp>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <boost/filesystem.hpp>
 
 #include <algorithm>
@@ -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<EclipseGridParser> deck;
-    boost::scoped_ptr<GridManager> grid;
-    boost::scoped_ptr<IncompPropertiesInterface> props;
-    boost::scoped_ptr<RockCompressibility> rock_comp;
+    std::unique_ptr<EclipseGridParser> deck;
+    std::unique_ptr<GridManager> grid;
+    std::unique_ptr<IncompPropertiesInterface> props;
+    std::unique_ptr<RockCompressibility> rock_comp;
     TwophaseState state;
     // bool check_well_controls = false;
     // int max_well_control_iterations = 0;

opm/core/props/BlackoilPropertiesFromDeck.hpp

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

opm/core/simulator/SimulatorCompressibleTwophase.cpp

@@ -49,7 +49,7 @@
 #include <opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.hpp>
 
 #include <boost/filesystem.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <boost/lexical_cast.hpp>
 
 #include <numeric>

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<Impl> pimpl_;
     };
 

opm/core/simulator/SimulatorIncompTwophase.cpp

@@ -47,7 +47,7 @@
 #include <opm/core/transport/reorder/TransportSolverTwophaseReorder.hpp>
 #include <opm/core/transport/implicit/TransportSolverTwophaseImplicit.hpp>
 #include <boost/filesystem.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <boost/lexical_cast.hpp>
 #include <boost/function.hpp>
 #include <boost/signal.hpp>
@@ -98,7 +98,7 @@ namespace Opm
         const FlowBoundaryConditions* bcs_;
         // Solvers
         IncompTpfa psolver_;
-        boost::scoped_ptr<TransportSolverTwophaseInterface> tsolver_;
+        std::unique_ptr<TransportSolverTwophaseInterface> tsolver_;
         // Misc. data
         std::vector<int> allcells_;
 

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<Impl> pimpl_;
 
         // implementation which is not templated, and can be in library

opm/core/transport/implicit/TransportSolverTwophaseImplicit.hpp

@@ -37,7 +37,7 @@
 #include <opm/core/grid.h>
 #include <opm/core/linalg/LinearSolverFactory.hpp>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <vector>