From bb27156df0a111fdecfe87b48d27b2866b7a2816 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Sun, 16 Dec 2012 18:19:52 -0800 Subject: [PATCH] use internal noncopyable class to speed up compile times slightly --- demo/viewer/styles_model.cpp | 5 +++-- include/mapnik/agg_pattern_source.hpp | 6 ++---- include/mapnik/agg_rasterizer.hpp | 6 +++--- include/mapnik/agg_renderer.hpp | 4 ++-- include/mapnik/attribute_collector.hpp | 5 +++-- include/mapnik/cairo_renderer.hpp | 6 +++--- include/mapnik/datasource.hpp | 6 +++--- include/mapnik/datasource_cache.hpp | 4 ++-- include/mapnik/debug.hpp | 8 ++++---- include/mapnik/feature.hpp | 8 +++++--- include/mapnik/font_engine_freetype.hpp | 16 ++++++++-------- include/mapnik/formatting/registry.hpp | 6 ++---- include/mapnik/geometry.hpp | 4 ++-- include/mapnik/grid/grid_rasterizer.hpp | 4 ++-- include/mapnik/grid/grid_renderer.hpp | 4 ++-- include/mapnik/hextree.hpp | 4 ++-- .../mapnik/json/feature_collection_grammar.hpp | 3 ++- .../mapnik/json/feature_collection_parser.hpp | 5 +++-- include/mapnik/json/geojson_generator.hpp | 11 ++++++----- include/mapnik/json/geometry_parser.hpp | 5 +++-- include/mapnik/label_collision_detector.hpp | 7 ++++--- include/mapnik/mapped_memory_cache.hpp | 4 ++-- include/mapnik/marker.hpp | 4 ++-- include/mapnik/marker_cache.hpp | 4 ++-- include/mapnik/markers_placement.hpp | 6 ++---- include/mapnik/octree.hpp | 6 ++---- include/mapnik/palette.hpp | 4 ++-- include/mapnik/placement_finder.hpp | 3 ++- include/mapnik/plugin.hpp | 6 +++--- include/mapnik/pool.hpp | 4 ++-- include/mapnik/processed_text.hpp | 3 ++- include/mapnik/proj_transform.hpp | 6 ++---- include/mapnik/quad_tree.hpp | 4 ++-- include/mapnik/raster.hpp | 6 ++---- include/mapnik/simplify_converter.hpp | 3 ++- include/mapnik/svg/output/svg_generator.hpp | 5 ++--- include/mapnik/svg/output/svg_renderer.hpp | 3 ++- include/mapnik/svg/svg_converter.hpp | 6 ++---- include/mapnik/svg/svg_parser.hpp | 4 ++-- include/mapnik/svg/svg_path_adapter.hpp | 6 +++--- include/mapnik/svg/svg_renderer_agg.hpp | 4 ++-- include/mapnik/svg/svg_storage.hpp | 6 ++---- include/mapnik/text_path.hpp | 6 +++--- include/mapnik/text_placements/base.hpp | 2 +- include/mapnik/text_placements/registry.hpp | 6 ++---- include/mapnik/unicode.hpp | 4 ++-- include/mapnik/vertex_converters.hpp | 4 ++-- include/mapnik/vertex_vector.hpp | 4 ++-- include/mapnik/wkb.hpp | 6 ++---- include/mapnik/wkt/wkt_factory.hpp | 5 +++-- plugins/input/shape/dbfile.hpp | 6 ++++-- plugins/input/shape/shape_io.hpp | 4 ++-- plugins/input/shape/shapefile.hpp | 4 ++-- plugins/input/sqlite/sqlite_prepared.hpp | 4 ++-- src/agg/process_line_pattern_symbolizer.cpp | 4 ++-- src/cairo_renderer.cpp | 10 +++++----- src/jpeg_reader.cpp | 4 ++-- src/libxml2_loader.cpp | 4 ++-- src/load_map.cpp | 3 ++- src/png_reader.cpp | 4 ++-- src/rapidxml_loader.cpp | 6 ++---- src/wkb.cpp | 4 ++-- utils/pgsql2sqlite/sqlite.hpp | 7 ++++--- 63 files changed, 160 insertions(+), 165 deletions(-) diff --git a/demo/viewer/styles_model.cpp b/demo/viewer/styles_model.cpp index 3468de005..875d97dbe 100644 --- a/demo/viewer/styles_model.cpp +++ b/demo/viewer/styles_model.cpp @@ -20,17 +20,18 @@ #include "styles_model.hpp" #include +#include + // boost #include #include -#include // qt #include #include #include #include -class node : private boost::noncopyable +class node : private mapnik::noncopyable { struct node_base { diff --git a/include/mapnik/agg_pattern_source.hpp b/include/mapnik/agg_pattern_source.hpp index 0f24ddaf4..39688e07e 100644 --- a/include/mapnik/agg_pattern_source.hpp +++ b/include/mapnik/agg_pattern_source.hpp @@ -25,9 +25,7 @@ // mapnik #include - -// boost -#include +#include // agg #include "agg_color_rgba.h" @@ -35,7 +33,7 @@ namespace mapnik { -class pattern_source : private boost::noncopyable +class pattern_source : private mapnik::noncopyable { public: pattern_source(image_data_32 const& pattern) diff --git a/include/mapnik/agg_rasterizer.hpp b/include/mapnik/agg_rasterizer.hpp index 49ac23b81..1f93c556f 100644 --- a/include/mapnik/agg_rasterizer.hpp +++ b/include/mapnik/agg_rasterizer.hpp @@ -23,15 +23,15 @@ #ifndef MAPNIK_AGG_RASTERIZER_HPP #define MAPNIK_AGG_RASTERIZER_HPP -// boost -#include +// mapnik +#include // agg #include "agg_rasterizer_scanline_aa.h" namespace mapnik { -struct rasterizer : agg::rasterizer_scanline_aa<>, boost::noncopyable {}; +struct rasterizer : agg::rasterizer_scanline_aa<>, mapnik::noncopyable {}; } diff --git a/include/mapnik/agg_renderer.hpp b/include/mapnik/agg_renderer.hpp index 68823917e..08b387a08 100644 --- a/include/mapnik/agg_renderer.hpp +++ b/include/mapnik/agg_renderer.hpp @@ -30,9 +30,9 @@ #include #include #include // for all symbolizers +#include // boost -#include #include #include #include @@ -53,7 +53,7 @@ struct rasterizer; template class MAPNIK_DECL agg_renderer : public feature_style_processor >, - private boost::noncopyable + private mapnik::noncopyable { public: diff --git a/include/mapnik/attribute_collector.hpp b/include/mapnik/attribute_collector.hpp index 9ff8b56cc..a1abc86a8 100644 --- a/include/mapnik/attribute_collector.hpp +++ b/include/mapnik/attribute_collector.hpp @@ -26,8 +26,9 @@ // mapnik #include #include +#include + // boost -#include #include #include // stl @@ -206,7 +207,7 @@ private: }; -class attribute_collector : public boost::noncopyable +class attribute_collector : public mapnik::noncopyable { private: std::set& names_; diff --git a/include/mapnik/cairo_renderer.hpp b/include/mapnik/cairo_renderer.hpp index b188050f8..e747823e3 100644 --- a/include/mapnik/cairo_renderer.hpp +++ b/include/mapnik/cairo_renderer.hpp @@ -32,13 +32,13 @@ #include #include #include // for all symbolizers +#include // cairo #include #include // boost -#include #include // FIXME @@ -57,7 +57,7 @@ class cairo_face; typedef boost::shared_ptr cairo_face_ptr; -class cairo_face_manager : private boost::noncopyable +class cairo_face_manager : private mapnik::noncopyable { public: cairo_face_manager(boost::shared_ptr engine); @@ -69,7 +69,7 @@ private: cairo_face_cache cache_; }; -class MAPNIK_DECL cairo_renderer_base : private boost::noncopyable +class MAPNIK_DECL cairo_renderer_base : private mapnik::noncopyable { protected: cairo_renderer_base(Map const& m, Cairo::RefPtr const& context, double scale_factor=1.0, unsigned offset_x=0, unsigned offset_y=0); diff --git a/include/mapnik/datasource.hpp b/include/mapnik/datasource.hpp index 014cc99e6..f05ce0c2b 100644 --- a/include/mapnik/datasource.hpp +++ b/include/mapnik/datasource.hpp @@ -29,9 +29,9 @@ #include #include #include +#include // boost -#include #include // stl @@ -42,7 +42,7 @@ namespace mapnik { typedef MAPNIK_DECL boost::shared_ptr feature_ptr; -struct MAPNIK_DECL Featureset : private boost::noncopyable +struct MAPNIK_DECL Featureset : private mapnik::noncopyable { virtual feature_ptr next() = 0; virtual ~Featureset() {} @@ -70,7 +70,7 @@ private: std::string message_; }; -class MAPNIK_DECL datasource : private boost::noncopyable +class MAPNIK_DECL datasource : private mapnik::noncopyable { public: enum datasource_t { diff --git a/include/mapnik/datasource_cache.hpp b/include/mapnik/datasource_cache.hpp index 51cdfd415..0b74f1663 100644 --- a/include/mapnik/datasource_cache.hpp +++ b/include/mapnik/datasource_cache.hpp @@ -28,9 +28,9 @@ #include #include #include +#include // boost -#include #include // stl @@ -40,7 +40,7 @@ namespace mapnik { class MAPNIK_DECL datasource_cache : public singleton, - private boost::noncopyable + private mapnik::noncopyable { friend class CreateStatic; public: diff --git a/include/mapnik/debug.hpp b/include/mapnik/debug.hpp index b53cc985c..caf5777fc 100644 --- a/include/mapnik/debug.hpp +++ b/include/mapnik/debug.hpp @@ -26,9 +26,9 @@ // mapnik (should not depend on anything that need to use this) #include #include +#include // boost -#include #include #ifdef MAPNIK_THREADSAFE #include @@ -50,7 +50,7 @@ namespace mapnik { */ class MAPNIK_DECL logger : public singleton, - private boost::noncopyable + private mapnik::noncopyable { public: enum severity_type @@ -186,7 +186,7 @@ namespace mapnik { class Ch = char, class Tr = std::char_traits, class A = std::allocator > - class base_log : public boost::noncopyable + class base_log : public mapnik::noncopyable { public: typedef OutputPolicy output_policy; @@ -245,7 +245,7 @@ namespace mapnik { class Ch = char, class Tr = std::char_traits, class A = std::allocator > - class base_log_always : public boost::noncopyable + class base_log_always : public mapnik::noncopyable { public: typedef OutputPolicy output_policy; diff --git a/include/mapnik/feature.hpp b/include/mapnik/feature.hpp index 3b6bf4751..d6a88a2aa 100644 --- a/include/mapnik/feature.hpp +++ b/include/mapnik/feature.hpp @@ -29,6 +29,8 @@ #include #include #include +#include + // boost #include #if BOOST_VERSION >= 104000 @@ -36,7 +38,7 @@ #else #include #endif -#include + #include #include @@ -52,7 +54,7 @@ typedef boost::shared_ptr raster_ptr; class feature_impl; template -class context : private boost::noncopyable, +class context : private mapnik::noncopyable, public boost::associative_property_map { @@ -95,7 +97,7 @@ typedef MAPNIK_DECL boost::shared_ptr context_ptr; static const value default_value; -class MAPNIK_DECL feature_impl : private boost::noncopyable +class MAPNIK_DECL feature_impl : private mapnik::noncopyable { friend class feature_kv_iterator; public: diff --git a/include/mapnik/font_engine_freetype.hpp b/include/mapnik/font_engine_freetype.hpp index d77206cb4..858b2c0cd 100644 --- a/include/mapnik/font_engine_freetype.hpp +++ b/include/mapnik/font_engine_freetype.hpp @@ -32,6 +32,7 @@ #include #include #include +#include // freetype2 extern "C" @@ -45,7 +46,6 @@ extern "C" // boost #include #include -#include #include #include #ifdef MAPNIK_THREADSAFE @@ -69,7 +69,7 @@ class string_info; typedef boost::shared_ptr face_ptr; -class MAPNIK_DECL font_glyph : private boost::noncopyable +class MAPNIK_DECL font_glyph : private mapnik::noncopyable { public: font_glyph(face_ptr face, unsigned index) @@ -91,7 +91,7 @@ private: typedef boost::shared_ptr glyph_ptr; -class font_face : boost::noncopyable +class font_face : mapnik::noncopyable { public: font_face(FT_Face face) @@ -145,7 +145,7 @@ private: FT_Face face_; }; -class MAPNIK_DECL font_face_set : private boost::noncopyable +class MAPNIK_DECL font_face_set : private mapnik::noncopyable { public: font_face_set(void) @@ -200,7 +200,7 @@ private: }; // FT_Stroker wrapper -class stroker : boost::noncopyable +class stroker : mapnik::noncopyable { public: explicit stroker(FT_Stroker s) @@ -264,7 +264,7 @@ private: }; template -class MAPNIK_DECL face_manager : private boost::noncopyable +class MAPNIK_DECL face_manager : private mapnik::noncopyable { typedef T font_engine_type; typedef std::map face_ptr_cache_type; @@ -351,9 +351,9 @@ private: }; template -struct text_renderer : private boost::noncopyable +struct text_renderer : private mapnik::noncopyable { - struct glyph_t : boost::noncopyable + struct glyph_t : mapnik::noncopyable { FT_Glyph image; char_properties *properties; diff --git a/include/mapnik/formatting/registry.hpp b/include/mapnik/formatting/registry.hpp index ef0f2c978..5e77ca006 100644 --- a/include/mapnik/formatting/registry.hpp +++ b/include/mapnik/formatting/registry.hpp @@ -25,9 +25,7 @@ // mapnik #include #include - -// boost -#include +#include // stl #include @@ -41,7 +39,7 @@ namespace formatting typedef node_ptr (*from_xml_function_ptr)(xml_node const& xml); class registry : public singleton, - private boost::noncopyable + private mapnik::noncopyable { public: registry(); diff --git a/include/mapnik/geometry.hpp b/include/mapnik/geometry.hpp index 2dcc0aeb9..aecc4536d 100644 --- a/include/mapnik/geometry.hpp +++ b/include/mapnik/geometry.hpp @@ -26,10 +26,10 @@ // mapnik #include #include +#include // boost #include -#include #include namespace mapnik { @@ -42,7 +42,7 @@ enum eGeomType { }; template class Container=vertex_vector> -class geometry : private::boost::noncopyable +class geometry : private::mapnik::noncopyable { public: typedef T coord_type; diff --git a/include/mapnik/grid/grid_rasterizer.hpp b/include/mapnik/grid/grid_rasterizer.hpp index 43fa30b72..9cdbf2724 100644 --- a/include/mapnik/grid/grid_rasterizer.hpp +++ b/include/mapnik/grid/grid_rasterizer.hpp @@ -23,12 +23,12 @@ #ifndef MAPNIK_GRID_RASTERIZER_HPP #define MAPNIK_GRID_RASTERIZER_HPP -#include +#include #include "agg_rasterizer_scanline_aa.h" namespace mapnik { -struct grid_rasterizer : agg::rasterizer_scanline_aa<>, boost::noncopyable {}; +struct grid_rasterizer : agg::rasterizer_scanline_aa<>, mapnik::noncopyable {}; } diff --git a/include/mapnik/grid/grid_renderer.hpp b/include/mapnik/grid/grid_renderer.hpp index 55e9cd901..6db0581a8 100644 --- a/include/mapnik/grid/grid_renderer.hpp +++ b/include/mapnik/grid/grid_renderer.hpp @@ -31,9 +31,9 @@ #include #include // for all symbolizers #include +#include // boost -#include #include // FIXME @@ -52,7 +52,7 @@ struct grid_rasterizer; template class MAPNIK_DECL grid_renderer : public feature_style_processor >, - private boost::noncopyable + private mapnik::noncopyable { public: diff --git a/include/mapnik/hextree.hpp b/include/mapnik/hextree.hpp index 9d399188c..20aa7e689 100644 --- a/include/mapnik/hextree.hpp +++ b/include/mapnik/hextree.hpp @@ -26,9 +26,9 @@ // mapnik #include #include +#include // boost -#include #include #include #if BOOST_VERSION >= 104600 @@ -60,7 +60,7 @@ struct RGBAPolicy }; template -class hextree : private boost::noncopyable +class hextree : private mapnik::noncopyable { struct node { diff --git a/include/mapnik/json/feature_collection_grammar.hpp b/include/mapnik/json/feature_collection_grammar.hpp index 6bd86590b..491a9ace1 100644 --- a/include/mapnik/json/feature_collection_grammar.hpp +++ b/include/mapnik/json/feature_collection_grammar.hpp @@ -25,6 +25,7 @@ // mapnik #include +#include // spirit::qi #include @@ -88,7 +89,7 @@ struct feature_collection_grammar : > lit(']') ; - feature = eps[_a = construct(new_(ctx_,generate_id_()))] + feature = eps[_a = construct(new_(ctx_,generate_id_()))] >> feature_g(*_a)[push_back(_r1,_a)] ; diff --git a/include/mapnik/json/feature_collection_parser.hpp b/include/mapnik/json/feature_collection_parser.hpp index f3805a621..5238f37a0 100644 --- a/include/mapnik/json/feature_collection_parser.hpp +++ b/include/mapnik/json/feature_collection_parser.hpp @@ -27,10 +27,11 @@ #include #include #include +#include // boost #include -#include + // stl #include @@ -39,7 +40,7 @@ namespace mapnik { namespace json { template struct feature_collection_grammar; template -class feature_collection_parser : private boost::noncopyable +class feature_collection_parser : private mapnik::noncopyable { typedef Iterator iterator_type; typedef mapnik::Feature feature_type; diff --git a/include/mapnik/json/geojson_generator.hpp b/include/mapnik/json/geojson_generator.hpp index 360272f11..36c587c3b 100644 --- a/include/mapnik/json/geojson_generator.hpp +++ b/include/mapnik/json/geojson_generator.hpp @@ -25,8 +25,9 @@ #include #include +#include + #include -#include #include namespace mapnik { namespace json { @@ -36,7 +37,7 @@ namespace mapnik { namespace json { template struct feature_generator_grammar; template struct multi_geometry_generator_grammar; -class MAPNIK_DECL feature_generator : private boost::noncopyable +class MAPNIK_DECL feature_generator : private mapnik::noncopyable { typedef std::back_insert_iterator sink_type; public: @@ -47,7 +48,7 @@ private: boost::scoped_ptr > grammar_; }; -class MAPNIK_DECL geometry_generator : private boost::noncopyable +class MAPNIK_DECL geometry_generator : private mapnik::noncopyable { typedef std::back_insert_iterator sink_type; public: @@ -60,7 +61,7 @@ private: #else -class MAPNIK_DECL feature_generator : private boost::noncopyable +class MAPNIK_DECL feature_generator : private mapnik::noncopyable { public: feature_generator() {} @@ -68,7 +69,7 @@ public: bool generate(std::string & geojson, mapnik::Feature const& f); }; -class MAPNIK_DECL geometry_generator : private boost::noncopyable +class MAPNIK_DECL geometry_generator : private mapnik::noncopyable { public: geometry_generator() {} diff --git a/include/mapnik/json/geometry_parser.hpp b/include/mapnik/json/geometry_parser.hpp index 851887714..76985f9a5 100644 --- a/include/mapnik/json/geometry_parser.hpp +++ b/include/mapnik/json/geometry_parser.hpp @@ -26,10 +26,11 @@ // mapnik #include #include +#include // boost #include -#include + // stl //#include @@ -40,7 +41,7 @@ template struct geometry_grammar; MAPNIK_DECL bool from_geojson(std::string const& json, boost::ptr_vector & paths); template -class MAPNIK_DECL geometry_parser : private boost::noncopyable +class MAPNIK_DECL geometry_parser : private mapnik::noncopyable { typedef Iterator iterator_type; public: diff --git a/include/mapnik/label_collision_detector.hpp b/include/mapnik/label_collision_detector.hpp index b4256bb6b..2db67d48f 100644 --- a/include/mapnik/label_collision_detector.hpp +++ b/include/mapnik/label_collision_detector.hpp @@ -25,6 +25,7 @@ // mapnik #include +#include // stl #include @@ -63,7 +64,7 @@ private: }; // quad_tree based label collision detector -class label_collision_detector2 : boost::noncopyable +class label_collision_detector2 : mapnik::noncopyable { typedef quad_tree > tree_t; tree_t tree_; @@ -97,7 +98,7 @@ public: }; // quad_tree based label collision detector with seperate check/insert -class label_collision_detector3 : boost::noncopyable +class label_collision_detector3 : mapnik::noncopyable { typedef quad_tree< box2d > tree_t; tree_t tree_; @@ -135,7 +136,7 @@ public: //quad tree based label collision detector so labels dont appear within a given distance -class label_collision_detector4 : boost::noncopyable +class label_collision_detector4 : mapnik::noncopyable { public: struct label diff --git a/include/mapnik/mapped_memory_cache.hpp b/include/mapnik/mapped_memory_cache.hpp index a8144a7c0..6b53481c1 100644 --- a/include/mapnik/mapped_memory_cache.hpp +++ b/include/mapnik/mapped_memory_cache.hpp @@ -26,9 +26,9 @@ // mapnik #include #include +#include // boost -#include #include #include #include @@ -43,7 +43,7 @@ typedef boost::shared_ptr mapped_region_ptr; struct MAPNIK_DECL mapped_memory_cache : public singleton, - private boost::noncopyable + private mapnik::noncopyable { friend class CreateStatic; boost::unordered_map cache_; diff --git a/include/mapnik/marker.hpp b/include/mapnik/marker.hpp index c882727a3..aac1a3660 100644 --- a/include/mapnik/marker.hpp +++ b/include/mapnik/marker.hpp @@ -29,12 +29,12 @@ #include #include #include +#include // agg #include "agg_path_storage.h" // boost -#include #include #include #include @@ -55,7 +55,7 @@ typedef boost::shared_ptr image_ptr; * A class to hold either vector or bitmap marker data. This allows these to be treated equally * in the image caches and most of the render paths. */ -class marker: private boost::noncopyable +class marker: private mapnik::noncopyable { public: marker() diff --git a/include/mapnik/marker_cache.hpp b/include/mapnik/marker_cache.hpp index e97d09ca8..eca2decd3 100644 --- a/include/mapnik/marker_cache.hpp +++ b/include/mapnik/marker_cache.hpp @@ -26,9 +26,9 @@ // mapnik #include #include +#include // boost -#include #include #include #include @@ -43,7 +43,7 @@ typedef boost::shared_ptr marker_ptr; class MAPNIK_DECL marker_cache : public singleton , - private boost::noncopyable + private mapnik::noncopyable { friend class CreateUsingNew; private: diff --git a/include/mapnik/markers_placement.hpp b/include/mapnik/markers_placement.hpp index 74b35011a..eddedafe3 100644 --- a/include/mapnik/markers_placement.hpp +++ b/include/mapnik/markers_placement.hpp @@ -30,9 +30,7 @@ #include #include //round #include - -// boost -#include +#include // agg #include "agg_basics.h" @@ -48,7 +46,7 @@ namespace mapnik { template -class markers_placement : boost::noncopyable +class markers_placement : mapnik::noncopyable { public: /** Constructor for markers_placement object. diff --git a/include/mapnik/octree.hpp b/include/mapnik/octree.hpp index 5535f2747..c2ec49f2c 100644 --- a/include/mapnik/octree.hpp +++ b/include/mapnik/octree.hpp @@ -26,9 +26,7 @@ // mapnik #include #include - -// boost -#include +#include // stl #include @@ -51,7 +49,7 @@ struct RGBPolicy }; template -class octree : private boost::noncopyable +class octree : private mapnik::noncopyable { struct node { diff --git a/include/mapnik/palette.hpp b/include/mapnik/palette.hpp index 703e38c02..8617c5735 100644 --- a/include/mapnik/palette.hpp +++ b/include/mapnik/palette.hpp @@ -26,9 +26,9 @@ // mapnik #include #include +#include // boost -#include #include // stl @@ -126,7 +126,7 @@ struct rgba typedef boost::unordered_map rgba_hash_table; -class MAPNIK_DECL rgba_palette : private boost::noncopyable { +class MAPNIK_DECL rgba_palette : private mapnik::noncopyable { public: enum palette_type { PALETTE_RGBA = 0, PALETTE_RGB = 1, PALETTE_ACT = 2 }; diff --git a/include/mapnik/placement_finder.hpp b/include/mapnik/placement_finder.hpp index fca15958b..9be885c72 100644 --- a/include/mapnik/placement_finder.hpp +++ b/include/mapnik/placement_finder.hpp @@ -30,6 +30,7 @@ #include #include #include +#include // agg @@ -54,7 +55,7 @@ typedef label_collision_detector4 DetectorType; template -class placement_finder : boost::noncopyable +class placement_finder : mapnik::noncopyable { public: placement_finder(Feature const& feature, diff --git a/include/mapnik/plugin.hpp b/include/mapnik/plugin.hpp index ef7a84d4d..8058f1483 100644 --- a/include/mapnik/plugin.hpp +++ b/include/mapnik/plugin.hpp @@ -23,8 +23,8 @@ #ifndef MAPNIK_PLUGIN_HPP #define MAPNIK_PLUGIN_HPP -// boost -#include +// mapnik +#include // stl #include @@ -34,7 +34,7 @@ namespace mapnik { -class PluginInfo : boost::noncopyable +class PluginInfo : mapnik::noncopyable { private: std::string name_; diff --git a/include/mapnik/pool.hpp b/include/mapnik/pool.hpp index efe338ce9..fe0572687 100644 --- a/include/mapnik/pool.hpp +++ b/include/mapnik/pool.hpp @@ -26,10 +26,10 @@ // mapnik #include #include +#include // boost #include -#include #ifdef MAPNIK_THREADSAFE #include #endif @@ -65,7 +65,7 @@ private: }; template class Creator> -class Pool : private boost::noncopyable +class Pool : private mapnik::noncopyable { typedef boost::shared_ptr HolderType; typedef std::deque ContType; diff --git a/include/mapnik/processed_text.hpp b/include/mapnik/processed_text.hpp index 54c2958e5..734300d89 100644 --- a/include/mapnik/processed_text.hpp +++ b/include/mapnik/processed_text.hpp @@ -26,11 +26,12 @@ #include #include #include +#include namespace mapnik { -class processed_text : boost::noncopyable +class processed_text : mapnik::noncopyable { public: class processed_expression diff --git a/include/mapnik/proj_transform.hpp b/include/mapnik/proj_transform.hpp index 607e99fb9..f238fc6e8 100644 --- a/include/mapnik/proj_transform.hpp +++ b/include/mapnik/proj_transform.hpp @@ -26,13 +26,11 @@ // mapnik #include #include - -// boost -#include +#include namespace mapnik { -class MAPNIK_DECL proj_transform : private boost::noncopyable +class MAPNIK_DECL proj_transform : private mapnik::noncopyable { public: proj_transform(projection const& source, diff --git a/include/mapnik/quad_tree.hpp b/include/mapnik/quad_tree.hpp index 9496122a3..3bbcbc465 100644 --- a/include/mapnik/quad_tree.hpp +++ b/include/mapnik/quad_tree.hpp @@ -25,10 +25,10 @@ // mapnik #include +#include // boost #include -#include // stl #include @@ -37,7 +37,7 @@ namespace mapnik { template -class quad_tree : boost::noncopyable +class quad_tree : mapnik::noncopyable { struct node { diff --git a/include/mapnik/raster.hpp b/include/mapnik/raster.hpp index e4b4ec288..4b1ce1cfb 100644 --- a/include/mapnik/raster.hpp +++ b/include/mapnik/raster.hpp @@ -26,12 +26,10 @@ // mapnik #include #include - -// boost -#include +#include namespace mapnik { -class raster : private boost::noncopyable +class raster : private mapnik::noncopyable { public: box2d ext_; diff --git a/include/mapnik/simplify_converter.hpp b/include/mapnik/simplify_converter.hpp index 2476311d2..a25cd7479 100644 --- a/include/mapnik/simplify_converter.hpp +++ b/include/mapnik/simplify_converter.hpp @@ -5,6 +5,7 @@ #include #include #include +#include // STL #include @@ -17,7 +18,7 @@ namespace mapnik { -struct weighted_vertex : private boost::noncopyable +struct weighted_vertex : private mapnik::noncopyable { vertex2d coord; double weight; diff --git a/include/mapnik/svg/output/svg_generator.hpp b/include/mapnik/svg/output/svg_generator.hpp index 973f32c75..bd5b3fffd 100644 --- a/include/mapnik/svg/output/svg_generator.hpp +++ b/include/mapnik/svg/output/svg_generator.hpp @@ -30,9 +30,8 @@ #include #include #include +#include -// boost -#include namespace mapnik { namespace svg { @@ -43,7 +42,7 @@ namespace mapnik { namespace svg { * structure. */ template - class svg_generator : private boost::noncopyable + class svg_generator : private mapnik::noncopyable { typedef svg::svg_root_attributes_grammar root_attributes_grammar; typedef svg::svg_rect_attributes_grammar rect_attributes_grammar; diff --git a/include/mapnik/svg/output/svg_renderer.hpp b/include/mapnik/svg/output/svg_renderer.hpp index bcde8d37c..05ebe356d 100644 --- a/include/mapnik/svg/output/svg_renderer.hpp +++ b/include/mapnik/svg/output/svg_renderer.hpp @@ -28,6 +28,7 @@ #include #include #include +#include // stl #include @@ -39,7 +40,7 @@ namespace mapnik // can target many other output destinations besides streams. template class MAPNIK_DECL svg_renderer : public feature_style_processor >, - private boost::noncopyable + private mapnik::noncopyable { public: typedef svg_renderer processor_impl_type; diff --git a/include/mapnik/svg/svg_converter.hpp b/include/mapnik/svg/svg_converter.hpp index 4ba4c4bff..d67c6c2ca 100644 --- a/include/mapnik/svg/svg_converter.hpp +++ b/include/mapnik/svg/svg_converter.hpp @@ -26,9 +26,7 @@ // mapnik #include #include - -// boost -#include +#include // agg #include "agg_path_storage.h" @@ -46,7 +44,7 @@ namespace mapnik { namespace svg { template -class svg_converter : boost::noncopyable +class svg_converter : mapnik::noncopyable { public: diff --git a/include/mapnik/svg/svg_parser.hpp b/include/mapnik/svg/svg_parser.hpp index 96559b6dc..68f151bf2 100644 --- a/include/mapnik/svg/svg_parser.hpp +++ b/include/mapnik/svg/svg_parser.hpp @@ -28,9 +28,9 @@ #include #include #include +#include // boost -#include #include // stl @@ -38,7 +38,7 @@ namespace mapnik { namespace svg { - class svg_parser : private boost::noncopyable + class svg_parser : private mapnik::noncopyable { public: explicit svg_parser(svg_converter_type & path); diff --git a/include/mapnik/svg/svg_path_adapter.hpp b/include/mapnik/svg/svg_path_adapter.hpp index edf24f27b..57f38aafd 100644 --- a/include/mapnik/svg/svg_path_adapter.hpp +++ b/include/mapnik/svg/svg_path_adapter.hpp @@ -24,7 +24,7 @@ #define MAPNIK_SVG_PATH_ADAPTER_HPP // mapnik -#include +#include // agg #include "agg_math.h" @@ -40,7 +40,7 @@ namespace svg { using namespace agg; -template class path_adapter : boost::noncopyable +template class path_adapter : mapnik::noncopyable { public: typedef VertexContainer container_type; @@ -838,7 +838,7 @@ void path_adapter::translate_all_paths(double dx, double dy) } -template class vertex_stl_adapter : boost::noncopyable +template class vertex_stl_adapter : mapnik::noncopyable { public: diff --git a/include/mapnik/svg/svg_renderer_agg.hpp b/include/mapnik/svg/svg_renderer_agg.hpp index 28a9b6128..c8aa62345 100644 --- a/include/mapnik/svg/svg_renderer_agg.hpp +++ b/include/mapnik/svg/svg_renderer_agg.hpp @@ -29,9 +29,9 @@ #include #include #include +#include // boost -#include #include // agg @@ -100,7 +100,7 @@ private: }; template -class svg_renderer_agg : boost::noncopyable +class svg_renderer_agg : mapnik::noncopyable { public: typedef agg::conv_curve curved_type; diff --git a/include/mapnik/svg/svg_storage.hpp b/include/mapnik/svg/svg_storage.hpp index 4d229cd81..a0827972a 100644 --- a/include/mapnik/svg/svg_storage.hpp +++ b/include/mapnik/svg/svg_storage.hpp @@ -25,15 +25,13 @@ // mapnik #include - -// boost -#include +#include namespace mapnik { namespace svg { template -class svg_storage : boost::noncopyable +class svg_storage : mapnik::noncopyable { public: svg_storage() {} diff --git a/include/mapnik/text_path.hpp b/include/mapnik/text_path.hpp index 557519ed2..b45ae9a6c 100644 --- a/include/mapnik/text_path.hpp +++ b/include/mapnik/text_path.hpp @@ -26,12 +26,12 @@ // mapnik #include #include +#include //stl #include // boost -#include #include // uci @@ -40,7 +40,7 @@ namespace mapnik { -class string_info : private boost::noncopyable +class string_info : private mapnik::noncopyable { protected: typedef std::vector characters_t; @@ -122,7 +122,7 @@ typedef char_info const * char_info_ptr; /** List of all characters and their positions and formats for a placement. */ -class text_path : boost::noncopyable +class text_path : mapnik::noncopyable { struct character_node { diff --git a/include/mapnik/text_placements/base.hpp b/include/mapnik/text_placements/base.hpp index 477bea26d..5fbc5c8fe 100644 --- a/include/mapnik/text_placements/base.hpp +++ b/include/mapnik/text_placements/base.hpp @@ -37,7 +37,7 @@ class MAPNIK_DECL text_placements; * This placement has first to be tested by placement_finder to verify it * can actually be used. */ -class text_placement_info : boost::noncopyable +class text_placement_info : mapnik::noncopyable { public: /** Constructor. Takes the parent text_placements object as a parameter diff --git a/include/mapnik/text_placements/registry.hpp b/include/mapnik/text_placements/registry.hpp index f3bd123bf..4fc71070e 100644 --- a/include/mapnik/text_placements/registry.hpp +++ b/include/mapnik/text_placements/registry.hpp @@ -25,9 +25,7 @@ // mapnik #include #include - -// boost -#include +#include // stl #include @@ -42,7 +40,7 @@ typedef text_placements_ptr (*from_xml_function_ptr)( xml_node const& xml, fontset_map const & fontsets); class registry : public singleton, - private boost::noncopyable + private mapnik::noncopyable { public: registry(); diff --git a/include/mapnik/unicode.hpp b/include/mapnik/unicode.hpp index 2e8a64656..ae2139a5e 100644 --- a/include/mapnik/unicode.hpp +++ b/include/mapnik/unicode.hpp @@ -25,13 +25,13 @@ //mapnik #include +#include // icu #include #include // boost -#include #include // stl @@ -39,7 +39,7 @@ namespace mapnik { -class MAPNIK_DECL transcoder : private boost::noncopyable +class MAPNIK_DECL transcoder : private mapnik::noncopyable { public: explicit transcoder (std::string const& encoding); diff --git a/include/mapnik/vertex_converters.hpp b/include/mapnik/vertex_converters.hpp index 5070c0ad9..cc41f7e91 100644 --- a/include/mapnik/vertex_converters.hpp +++ b/include/mapnik/vertex_converters.hpp @@ -44,13 +44,13 @@ #include #include -#include #include // mapnik #include #include #include +#include // agg #include "agg_conv_clip_polygon.h" @@ -317,7 +317,7 @@ struct dispatcher template -struct vertex_converter : private boost::noncopyable +struct vertex_converter : private mapnik::noncopyable { typedef C conv_types; typedef B bbox_type; diff --git a/include/mapnik/vertex_vector.hpp b/include/mapnik/vertex_vector.hpp index e17a69320..44fbd7884 100644 --- a/include/mapnik/vertex_vector.hpp +++ b/include/mapnik/vertex_vector.hpp @@ -29,9 +29,9 @@ // mapnik #include +#include // boost -#include #include #include // required for memcpy with linux/g++ @@ -40,7 +40,7 @@ namespace mapnik { template -class vertex_vector : private boost::noncopyable +class vertex_vector : private mapnik::noncopyable { typedef T coord_type; typedef vertex vertex_type; diff --git a/include/mapnik/wkb.hpp b/include/mapnik/wkb.hpp index 5f546fe69..0f440aa57 100644 --- a/include/mapnik/wkb.hpp +++ b/include/mapnik/wkb.hpp @@ -25,9 +25,7 @@ // mapnik #include - -// boost -#include +#include namespace mapnik { @@ -50,7 +48,7 @@ enum wkbFormat wkbSpatiaLite=3 }; -class MAPNIK_DECL geometry_utils : private boost::noncopyable +class MAPNIK_DECL geometry_utils : private mapnik::noncopyable { public: diff --git a/include/mapnik/wkt/wkt_factory.hpp b/include/mapnik/wkt/wkt_factory.hpp index 8fc246db9..a35299b9b 100644 --- a/include/mapnik/wkt/wkt_factory.hpp +++ b/include/mapnik/wkt/wkt_factory.hpp @@ -27,8 +27,9 @@ #include #include #include +#include + // boost -#include #include #include #include @@ -42,7 +43,7 @@ MAPNIK_DECL bool from_wkt(std::string const& wkt, boost::ptr_vector= 104700 -class MAPNIK_DECL wkt_parser : boost::noncopyable +class MAPNIK_DECL wkt_parser : mapnik::noncopyable { typedef std::string::const_iterator iterator_type; public: diff --git a/plugins/input/shape/dbfile.hpp b/plugins/input/shape/dbfile.hpp index 1d6bb4473..423409e3e 100644 --- a/plugins/input/shape/dbfile.hpp +++ b/plugins/input/shape/dbfile.hpp @@ -23,9 +23,11 @@ #ifndef DBFFILE_HPP #define DBFFILE_HPP +// mapnik #include +#include + // boost -#include #include // stl @@ -48,7 +50,7 @@ struct field_descriptor }; -class dbf_file : private boost::noncopyable +class dbf_file : private mapnik::noncopyable { private: int num_records_; diff --git a/plugins/input/shape/shape_io.hpp b/plugins/input/shape/shape_io.hpp index bbfe2cd85..4f5c8cd2b 100644 --- a/plugins/input/shape/shape_io.hpp +++ b/plugins/input/shape/shape_io.hpp @@ -26,16 +26,16 @@ // mapnik #include #include +#include // boost -#include #include #include "dbfile.hpp" #include "shapefile.hpp" #include "shp_index.hpp" -struct shape_io : boost::noncopyable +struct shape_io : mapnik::noncopyable { public: enum shapeType diff --git a/plugins/input/shape/shapefile.hpp b/plugins/input/shape/shapefile.hpp index 095f2c69b..cf97a9da0 100644 --- a/plugins/input/shape/shapefile.hpp +++ b/plugins/input/shape/shapefile.hpp @@ -31,9 +31,9 @@ #include #include #include +#include // boost -#include #include #include @@ -130,7 +130,7 @@ struct shape_record using namespace boost::interprocess; -class shape_file : boost::noncopyable +class shape_file : mapnik::noncopyable { public: diff --git a/plugins/input/sqlite/sqlite_prepared.hpp b/plugins/input/sqlite/sqlite_prepared.hpp index f6bf45339..477759f5d 100644 --- a/plugins/input/sqlite/sqlite_prepared.hpp +++ b/plugins/input/sqlite/sqlite_prepared.hpp @@ -27,10 +27,10 @@ #include #include #include +#include // boost #include -#include // stl #include @@ -42,7 +42,7 @@ extern "C" { #include } -class prepared_index_statement : boost::noncopyable +class prepared_index_statement : mapnik::noncopyable { public: diff --git a/src/agg/process_line_pattern_symbolizer.cpp b/src/agg/process_line_pattern_symbolizer.cpp index 29ce388b7..e68e7d0ff 100644 --- a/src/agg/process_line_pattern_symbolizer.cpp +++ b/src/agg/process_line_pattern_symbolizer.cpp @@ -31,6 +31,7 @@ #include #include #include +#include // agg #include "agg_basics.h" @@ -47,12 +48,11 @@ #include "agg_conv_clip_polyline.h" // boost -#include #include namespace { -class pattern_source : private boost::noncopyable +class pattern_source : private mapnik::noncopyable { public: pattern_source(mapnik::image_data_32 const& pattern) diff --git a/src/cairo_renderer.cpp b/src/cairo_renderer.cpp index 1b9e90540..3701ec044 100644 --- a/src/cairo_renderer.cpp +++ b/src/cairo_renderer.cpp @@ -44,6 +44,7 @@ #include #include #include +#include // cairo #include @@ -52,7 +53,6 @@ #include // boost -#include #include #include @@ -72,7 +72,7 @@ namespace mapnik { -class cairo_pattern : private boost::noncopyable +class cairo_pattern : private mapnik::noncopyable { public: cairo_pattern(image_data_32 const& data) @@ -146,7 +146,7 @@ private: Cairo::RefPtr pattern_; }; -class cairo_gradient : private boost::noncopyable +class cairo_gradient : private mapnik::noncopyable { public: cairo_gradient(const mapnik::gradient &grad, double opacity=1.0) @@ -202,7 +202,7 @@ private: }; -class cairo_face : private boost::noncopyable +class cairo_face : private mapnik::noncopyable { public: cairo_face(boost::shared_ptr const& engine, face_ptr const& face) @@ -269,7 +269,7 @@ cairo_face_ptr cairo_face_manager::get_face(face_ptr face) return entry; } -class cairo_context : private boost::noncopyable +class cairo_context : private mapnik::noncopyable { public: cairo_context(Cairo::RefPtr const& context) diff --git a/src/jpeg_reader.cpp b/src/jpeg_reader.cpp index 47703651b..1b3eab6c1 100644 --- a/src/jpeg_reader.cpp +++ b/src/jpeg_reader.cpp @@ -23,6 +23,7 @@ // mapnik #include #include +#include // jpeg extern "C" @@ -32,14 +33,13 @@ extern "C" // boost #include -#include // std #include namespace mapnik { -class JpegReader : public image_reader, boost::noncopyable +class JpegReader : public image_reader, mapnik::noncopyable { private: std::string fileName_; diff --git a/src/libxml2_loader.cpp b/src/libxml2_loader.cpp index 90f6e5cc3..e4af0c66c 100644 --- a/src/libxml2_loader.cpp +++ b/src/libxml2_loader.cpp @@ -27,9 +27,9 @@ #include #include #include +#include // boost -#include #include // libxml @@ -42,7 +42,7 @@ namespace mapnik { -class libxml2_loader : boost::noncopyable +class libxml2_loader : mapnik::noncopyable { public: libxml2_loader(const char *encoding = NULL, int options = DEFAULT_OPTIONS, const char *url = NULL) : diff --git a/src/load_map.cpp b/src/load_map.cpp index 1f7efe210..5ab4a1f15 100644 --- a/src/load_map.cpp +++ b/src/load_map.cpp @@ -50,6 +50,7 @@ #include #include #include +#include // boost #include @@ -71,7 +72,7 @@ namespace mapnik { using boost::optional; -class map_parser : boost::noncopyable { +class map_parser : mapnik::noncopyable { public: map_parser(bool strict, std::string const& filename = "") : strict_(strict), diff --git a/src/png_reader.cpp b/src/png_reader.cpp index dde14ed70..1e542ce0b 100644 --- a/src/png_reader.cpp +++ b/src/png_reader.cpp @@ -22,6 +22,7 @@ #include #include +#include extern "C" { @@ -29,11 +30,10 @@ extern "C" } #include -#include namespace mapnik { -class png_reader : public image_reader, boost::noncopyable +class png_reader : public image_reader, mapnik::noncopyable { private: std::string fileName_; diff --git a/src/rapidxml_loader.cpp b/src/rapidxml_loader.cpp index 4c0898bee..a983b7c22 100644 --- a/src/rapidxml_loader.cpp +++ b/src/rapidxml_loader.cpp @@ -32,9 +32,7 @@ #include #include #include - -// boost -#include +#include // stl #include @@ -43,7 +41,7 @@ namespace rapidxml = boost::property_tree::detail::rapidxml; namespace mapnik { -class rapidxml_loader : boost::noncopyable +class rapidxml_loader : mapnik::noncopyable { public: rapidxml_loader(const char *encoding = NULL) : diff --git a/src/wkb.cpp b/src/wkb.cpp index 2e57b8600..dfef08a69 100644 --- a/src/wkb.cpp +++ b/src/wkb.cpp @@ -27,9 +27,9 @@ #include #include #include +#include // boost -#include #include namespace mapnik @@ -37,7 +37,7 @@ namespace mapnik typedef coord_array CoordinateArray; -struct wkb_reader : boost::noncopyable +struct wkb_reader : mapnik::noncopyable { private: enum wkbByteOrder { diff --git a/utils/pgsql2sqlite/sqlite.hpp b/utils/pgsql2sqlite/sqlite.hpp index e7ce0eb1b..1266a7604 100644 --- a/utils/pgsql2sqlite/sqlite.hpp +++ b/utils/pgsql2sqlite/sqlite.hpp @@ -20,10 +20,11 @@ * *****************************************************************************/ +#include // boost #include -#include #include + //sqlite3 #include @@ -36,7 +37,7 @@ namespace mapnik { namespace sqlite { - class database : private boost::noncopyable + class database : private mapnik::noncopyable { friend class prepared_statement; @@ -73,7 +74,7 @@ namespace mapnik { namespace sqlite { typedef boost::variant value_type; typedef std::vector record_type; - class prepared_statement : boost::noncopyable + class prepared_statement : mapnik::noncopyable { struct binder : public boost::static_visitor {