Replace boost::scoped_ptr with std::unique_ptr within osm2pgsql itself

Author: pnorman

expire-tiles.cpp

@@ -496,7 +496,7 @@ int expire_tiles::from_db(table_t* table, osmid_t osm_id) {
         return -1;
 
     //grab the geom for this id
-    std::shared_ptr<table_t::wkt_reader> wkts = table->get_wkt_reader(osm_id);
+    std::unique_ptr<table_t::wkt_reader> wkts = table->get_wkt_reader(osm_id);
 
     //dirty the stuff
     const char* wkt = nullptr;

id-tracker.hpp

@@ -3,7 +3,7 @@
 
 #include "osmtypes.hpp"
 #include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 struct id_tracker : public boost::noncopyable {
     id_tracker();
@@ -20,7 +20,7 @@ struct id_tracker : public boost::noncopyable {
 
 private:
     struct pimpl;
-    boost::scoped_ptr<pimpl> impl;
+    std::unique_ptr<pimpl> impl;
 };
 
 #endif /* ID_TRACKER_HPP */

output-multi.hpp

@@ -14,7 +14,6 @@
 #include <cstddef>
 #include <string>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 class table_t;
 class tagtransform;
@@ -73,11 +72,11 @@ class output_multi_t : public output_t {
     int process_relation(osmid_t id, const memberlist_t &members, const taglist_t &tags, bool exists, bool pending=false);
     void copy_to_table(osmid_t id, const char *wkt, const taglist_t &tags);
 
-    boost::scoped_ptr<tagtransform> m_tagtransform;
-    boost::scoped_ptr<export_list> m_export_list;
+    std::unique_ptr<tagtransform> m_tagtransform;
+    std::unique_ptr<export_list> m_export_list;
     std::shared_ptr<geometry_processor> m_processor;
     const OsmType m_osm_type;
-    boost::scoped_ptr<table_t> m_table;
+    std::unique_ptr<table_t> m_table;
     std::shared_ptr<id_tracker> ways_pending_tracker, ways_done_tracker, rels_pending_tracker;
     std::shared_ptr<expire_tiles> m_expire;
     way_helper m_way_helper;

output-pgsql.hpp

@@ -70,14 +70,14 @@ class output_pgsql_t : public output_t {
     int pgsql_delete_way_from_output(osmid_t osm_id);
     int pgsql_delete_relation_from_output(osmid_t osm_id);
 
-    boost::scoped_ptr<tagtransform> m_tagtransform;
+    std::unique_ptr<tagtransform> m_tagtransform;
 
     //enable output of a generated way_area tag to either hstore or its own column
     int m_enable_way_area;
 
     std::vector<std::shared_ptr<table_t> > m_tables;
 
-    boost::scoped_ptr<export_list> m_export_list;
+    std::unique_ptr<export_list> m_export_list;
 
     geometry_builder builder;
 

table.cpp

@@ -516,7 +516,7 @@ void table_t::escape_type(const string &value, const string &type, string& dst)
         escape(value, dst);
 }
 
-std::shared_ptr<table_t::wkt_reader> table_t::get_wkt_reader(const osmid_t id)
+std::unique_ptr<table_t::wkt_reader> table_t::get_wkt_reader(const osmid_t id)
 {
     //cant get wkt using the prepared statement without stopping the copy first
     stop_copy();
@@ -529,7 +529,7 @@ std::shared_ptr<table_t::wkt_reader> table_t::get_wkt_reader(const osmid_t id)
     //the prepared statement get_wkt will behave differently depending on the sql_conn
     //each table has its own sql_connection with the get_way referring to the appropriate table
     PGresult* res = pgsql_execPrepared(sql_conn, "get_wkt", 1, (const char * const *)paramValues, PGRES_TUPLES_OK);
-    return std::shared_ptr<wkt_reader>(new wkt_reader(res));
+    return std::unique_ptr<wkt_reader>(new wkt_reader(res));
 }
 
 table_t::wkt_reader::wkt_reader(PGresult* result):result(result), current(0)

table.hpp

@@ -52,7 +52,7 @@ class table_t
                 size_t count;
                 size_t current;
         };
-        std::shared_ptr<wkt_reader> get_wkt_reader(const osmid_t id);
+        std::unique_ptr<wkt_reader> get_wkt_reader(const osmid_t id);
 
     protected:
         void connect();