sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

+ replace <boost/shared_ptr.hpp> with <memory>

Browse source
This commit is contained in:
artemp 2013-09-20 14:13:23 +01:00
parent b315eb2167
commit 62af2e6765
53 changed files with 54 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
benchmark/run.cpp
View file

@ -16,7 +16,7 @@
// boost // boost
#include <boost/version.hpp> #include <boost/version.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <boost/bind.hpp> #include <boost/bind.hpp>

2
bindings/python/mapnik_wkt_reader.cpp
View file

@ -23,7 +23,7 @@
// boost // boost
#include <boost/python.hpp> #include <boost/python.hpp>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_vector.hpp>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
// mapnik // mapnik

2
boost/geometry/extensions/index/rtree/rtree.hpp
View file

@ -17,7 +17,7 @@
#include <vector> #include <vector>
#include <boost/concept_check.hpp> #include <boost/concept_check.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/geometry/algorithms/area.hpp> #include <boost/geometry/algorithms/area.hpp>

2
boost/geometry/extensions/index/rtree/rtree_leaf.hpp
View file

@ -16,7 +16,7 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/geometry/algorithms/area.hpp> #include <boost/geometry/algorithms/area.hpp>
#include <boost/geometry/algorithms/assign.hpp> #include <boost/geometry/algorithms/assign.hpp>

2
boost/geometry/extensions/index/rtree/rtree_node.hpp
View file

@ -16,7 +16,7 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/geometry/algorithms/area.hpp> #include <boost/geometry/algorithms/area.hpp>
#include <boost/geometry/algorithms/assign.hpp> #include <boost/geometry/algorithms/assign.hpp>

2
demo/viewer/mapwidget.hpp
View file

@ -28,7 +28,7 @@
#include <QItemSelection> #include <QItemSelection>
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#ifndef Q_MOC_RUN #ifndef Q_MOC_RUN

2
include/mapnik/agg_renderer.hpp
View file

@ -38,7 +38,7 @@
// boost // boost
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
// fwd declaration to avoid depedence on agg headers // fwd declaration to avoid depedence on agg headers
namespace agg { struct trans_affine; } namespace agg { struct trans_affine; }

2
include/mapnik/cairo_context.hpp
View file

@ -37,7 +37,7 @@
#include <mapnik/noncopyable.hpp> #include <mapnik/noncopyable.hpp>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
// cairo // cairo
#include <cairo.h> #include <cairo.h>

2
include/mapnik/char_info.hpp
View file

@ -23,7 +23,7 @@
#ifndef MAPNIK_CHAR_INFO_HPP #ifndef MAPNIK_CHAR_INFO_HPP
#define MAPNIK_CHAR_INFO_HPP #define MAPNIK_CHAR_INFO_HPP
#include <boost/shared_ptr.hpp> #include <memory>
namespace mapnik { namespace mapnik {
struct char_properties; struct char_properties;

2
include/mapnik/datasource.hpp
View file

@ -32,7 +32,7 @@
#include <mapnik/noncopyable.hpp> #include <mapnik/noncopyable.hpp>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/optional.hpp> #include <boost/optional.hpp>
// stl // stl

2
include/mapnik/datasource_cache.hpp
View file

@ -30,7 +30,7 @@
#include <mapnik/noncopyable.hpp> #include <mapnik/noncopyable.hpp>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
// stl // stl
#include <map> #include <map>

2
include/mapnik/expression.hpp
View file

@ -28,7 +28,7 @@
#include <mapnik/expression_node_types.hpp> #include <mapnik/expression_node_types.hpp>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
// stl // stl
#include <string> #include <string>

2
include/mapnik/expression_string.hpp
View file

@ -28,7 +28,7 @@
#include <mapnik/expression_node_types.hpp> #include <mapnik/expression_node_types.hpp>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
// stl // stl
#include <string> #include <string>

2
include/mapnik/feature.hpp
View file

@ -33,7 +33,7 @@
#include <mapnik/noncopyable.hpp> #include <mapnik/noncopyable.hpp>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_vector.hpp>
// stl // stl

2
include/mapnik/font_engine_freetype.hpp
View file

@ -39,7 +39,7 @@
#include <mapnik/pixel_position.hpp> #include <mapnik/pixel_position.hpp>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_vector.hpp>

2
include/mapnik/geometry.hpp
View file

@ -29,7 +29,7 @@
#include <mapnik/noncopyable.hpp> #include <mapnik/noncopyable.hpp>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_vector.hpp>
namespace mapnik { namespace mapnik {

2
include/mapnik/grid/grid_renderer.hpp
View file

@ -38,7 +38,7 @@
// boost // boost
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
// fwd declaration to avoid depedence on agg headers // fwd declaration to avoid depedence on agg headers
namespace agg { struct trans_affine; } namespace agg { struct trans_affine; }

2
include/mapnik/mapped_memory_cache.hpp
View file

@ -30,7 +30,7 @@
// boost // boost
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/interprocess/interprocess_fwd.hpp> #include <boost/interprocess/interprocess_fwd.hpp>

2
include/mapnik/marker.hpp
View file

@ -36,7 +36,7 @@
// boost // boost
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>

2
include/mapnik/marker_cache.hpp
View file

@ -30,7 +30,7 @@
// boost // boost
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/optional.hpp> #include <boost/optional.hpp>
namespace mapnik namespace mapnik

2
include/mapnik/path_expression.hpp
View file

@ -25,7 +25,7 @@
// boost // boost
#include <boost/variant/variant_fwd.hpp> #include <boost/variant/variant_fwd.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
// stl // stl
#include <string> #include <string>

2
include/mapnik/pool.hpp
View file

@ -29,7 +29,7 @@
#include <mapnik/noncopyable.hpp> #include <mapnik/noncopyable.hpp>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
#ifdef MAPNIK_THREADSAFE #ifdef MAPNIK_THREADSAFE
#include <boost/thread/mutex.hpp> #include <boost/thread/mutex.hpp>
#endif #endif

2
include/mapnik/raster_colorizer.hpp
View file

@ -43,7 +43,7 @@
#include <mapnik/enumeration.hpp> #include <mapnik/enumeration.hpp>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
// stl // stl
#include <vector> #include <vector>

2
include/mapnik/svg/output/svg_path_iterator.hpp
View file

@ -30,7 +30,7 @@
// boost // boost
#include <boost/iterator/iterator_adaptor.hpp> #include <boost/iterator/iterator_adaptor.hpp>
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
namespace mapnik { namespace mapnik {

2
include/mapnik/svg/output/svg_renderer.hpp
View file

@ -41,7 +41,7 @@
// boost // boost
#include <boost/variant/static_visitor.hpp> #include <boost/variant/static_visitor.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
// stl // stl
#include <string> #include <string>

2
include/mapnik/symbolizer.hpp
View file

@ -30,7 +30,7 @@
#include <mapnik/simplify.hpp> #include <mapnik/simplify.hpp>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
// stl // stl
#include <vector> #include <vector>

2
include/mapnik/text_path.hpp
View file

@ -33,7 +33,7 @@
#include <vector> #include <vector>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
namespace mapnik namespace mapnik
{ {

2
include/mapnik/text_symbolizer.hpp
View file

@ -31,7 +31,7 @@
#include <mapnik/text_placements/dummy.hpp> #include <mapnik/text_placements/dummy.hpp>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
// stl // stl

2
include/mapnik/transform_expression.hpp
View file

@ -28,7 +28,7 @@
// boost // boost
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/variant/variant.hpp> #include <boost/variant/variant.hpp>
// fusion // fusion

2
plugins/input/geojson/geojson_datasource.hpp
View file

@ -35,7 +35,7 @@
// boost // boost
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/geometry/geometries/box.hpp> #include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/geometries/point_xy.hpp> #include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/algorithms/area.hpp> #include <boost/geometry/algorithms/area.hpp>

2
plugins/input/occi/occi_datasource.hpp
View file

@ -35,7 +35,7 @@
// boost // boost
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
// stl // stl
#include <vector> #include <vector>

2
plugins/input/occi/occi_featureset.hpp
View file

@ -31,7 +31,7 @@
// boost // boost
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
// oci // oci
#include "occi_types.hpp" #include "occi_types.hpp"

2
plugins/input/ogr/ogr_datasource.hpp
View file

@ -34,7 +34,7 @@
// boost // boost
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
// stl // stl
#include <vector> #include <vector>

2
plugins/input/osm/osm_datasource.hpp
View file

@ -34,7 +34,7 @@
// boost // boost
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
// stl // stl
#include <vector> #include <vector>

2
plugins/input/postgis/connection_manager.hpp
View file

@ -30,7 +30,7 @@
#include <mapnik/utils.hpp> #include <mapnik/utils.hpp>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>

2
plugins/input/postgis/postgis_datasource.hpp
View file

@ -36,7 +36,7 @@
// boost // boost
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
// stl // stl

2
plugins/input/raster/raster_datasource.hpp
View file

@ -34,7 +34,7 @@
// boost // boost
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
// stl // stl
#include <vector> #include <vector>

2
plugins/input/rasterlite/rasterlite_datasource.hpp
View file

@ -34,7 +34,7 @@
// boost // boost
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
// stl // stl
#include <vector> #include <vector>

2
plugins/input/shape/shape_datasource.hpp
View file

@ -35,7 +35,7 @@
// boost // boost
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
// stl // stl
#include <vector> #include <vector>

2
plugins/input/shape/shape_io.hpp
View file

@ -29,7 +29,7 @@
#include <mapnik/noncopyable.hpp> #include <mapnik/noncopyable.hpp>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
#include "dbfile.hpp" #include "dbfile.hpp"
#include "shapefile.hpp" #include "shapefile.hpp"

2
plugins/input/sqlite/sqlite_connection.hpp
View file

@ -32,7 +32,7 @@
#include <mapnik/timer.hpp> #include <mapnik/timer.hpp>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>

2
plugins/input/sqlite/sqlite_datasource.hpp
View file

@ -36,7 +36,7 @@
// boost // boost
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
// stl // stl
#include <vector> #include <vector>

2
plugins/input/sqlite/sqlite_featureset.hpp
View file

@ -30,7 +30,7 @@
// boost // boost
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
// sqlite // sqlite
#include "sqlite_resultset.hpp" #include "sqlite_resultset.hpp"

2
plugins/input/sqlite/sqlite_prepared.hpp
View file

@ -31,7 +31,7 @@
#include <mapnik/noncopyable.hpp> #include <mapnik/noncopyable.hpp>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
// stl // stl
#include <string.h> #include <string.h>

2
plugins/input/sqlite/sqlite_utils.hpp
View file

@ -38,7 +38,7 @@
#include <mapnik/util/fs.hpp> #include <mapnik/util/fs.hpp>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>

2
plugins/input/templates/helloworld/hello_datasource.hpp
View file

@ -12,7 +12,7 @@
// boost // boost
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
// stl // stl
#include <string> #include <string>

2
src/jpeg_reader.cpp
View file

@ -31,7 +31,7 @@ extern "C"
} }
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/scoped_array.hpp> #include <boost/scoped_array.hpp>
#include <boost/iostreams/device/file.hpp> #include <boost/iostreams/device/file.hpp>
#include <boost/iostreams/device/array.hpp> #include <boost/iostreams/device/array.hpp>

2
src/placement_finder.cpp
View file

@ -33,7 +33,7 @@
#include "agg_path_length.h" #include "agg_path_length.h"
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_vector.hpp>
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>

2
src/rule.cpp
View file

@ -41,7 +41,7 @@
#include <mapnik/debug_symbolizer.hpp> #include <mapnik/debug_symbolizer.hpp>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <boost/concept_check.hpp> #include <boost/concept_check.hpp>

2
src/tiff_reader.cpp
View file

@ -25,7 +25,7 @@
#include <mapnik/image_reader.hpp> #include <mapnik/image_reader.hpp>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
// iostreams // iostreams
#include <boost/iostreams/device/file.hpp> #include <boost/iostreams/device/file.hpp>

2
utils/pgsql2sqlite/main.cpp
View file

@ -28,7 +28,7 @@
// boost // boost
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
//stl //stl

2
utils/pgsql2sqlite/pgsql2sqlite.hpp
View file

@ -36,7 +36,7 @@
// boost // boost
#include <boost/cstdint.hpp> #include <boost/cstdint.hpp>
#include <boost/scoped_array.hpp> #include <boost/scoped_array.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
//stl //stl

2
utils/pgsql2sqlite/sqlite.hpp
View file

@ -22,7 +22,7 @@
#include <mapnik/noncopyable.hpp> #include <mapnik/noncopyable.hpp>
// boost // boost
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/variant.hpp> #include <boost/variant.hpp>
//sqlite3 //sqlite3