diff --git a/plugins/input/postgis/connection.hpp b/plugins/input/postgis/connection.hpp index 9a8da17ce..6a8239cbe 100644 --- a/plugins/input/postgis/connection.hpp +++ b/plugins/input/postgis/connection.hpp @@ -26,6 +26,7 @@ #define CONNECTION_HPP #include +#include extern "C" { @@ -98,7 +99,7 @@ class Connection throw mapnik::datasource_exception( s.str() ); } - return boost::shared_ptr(new ResultSet(result)); + return boost::make_shared(result); } std::string client_encoding() const diff --git a/plugins/input/postgis/connection_manager.hpp b/plugins/input/postgis/connection_manager.hpp index ca6909ecd..35bba4f2a 100644 --- a/plugins/input/postgis/connection_manager.hpp +++ b/plugins/input/postgis/connection_manager.hpp @@ -30,6 +30,7 @@ #include #include "connection.hpp" #include +#include #include #ifdef MAPNIK_THREADSAFE @@ -111,7 +112,7 @@ public: if (pools_.find(creator.id())==pools_.end()) { return pools_.insert(std::make_pair(creator.id(), - boost::shared_ptr(new PoolType(creator,initialSize,maxSize)))).second; + boost::make_shared(creator,initialSize,maxSize))).second; } return false; diff --git a/src/cairo_renderer.cpp b/src/cairo_renderer.cpp index 3f69f38d5..e1976f547 100644 --- a/src/cairo_renderer.cpp +++ b/src/cairo_renderer.cpp @@ -1115,7 +1115,7 @@ void cairo_renderer_base::process(shield_symbolizer const& sym, } else { - marker.reset(boost::shared_ptr (new mapnik::marker())); + marker.reset(boost::make_shared()); } if (text.length() > 0 && marker) diff --git a/src/grid/process_point_symbolizer.cpp b/src/grid/process_point_symbolizer.cpp index 4012a44f3..88f94a7d8 100644 --- a/src/grid/process_point_symbolizer.cpp +++ b/src/grid/process_point_symbolizer.cpp @@ -50,7 +50,7 @@ void grid_renderer::process(point_symbolizer const& sym, } else { - marker.reset(boost::shared_ptr (new mapnik::marker())); + marker.reset(boost::make_shared()); } if (marker) diff --git a/src/grid/process_shield_symbolizer.cpp b/src/grid/process_shield_symbolizer.cpp index 1b2c37bba..182412f22 100644 --- a/src/grid/process_shield_symbolizer.cpp +++ b/src/grid/process_shield_symbolizer.cpp @@ -89,7 +89,7 @@ void grid_renderer::process(shield_symbolizer const& sym, } else { - marker.reset(boost::shared_ptr (new mapnik::marker())); + marker.reset(boost::make_shared()); } if (text.length() > 0 && marker)