use internal noncopyable class to speed up compile times slightly

demo/viewer/styles_model.cpp

@@ -20,17 +20,18 @@
 
 #include "styles_model.hpp"
 #include <mapnik/expression_string.hpp>
+#include <mapnik/noncopyable.hpp>
+
 // boost
 #include <boost/concept_check.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <boost/utility.hpp>
 // qt
 #include <QList>
 #include <QIcon>
 #include <QPainter>
 #include <QPixmap>
 
-class node : private boost::noncopyable
+class node : private mapnik::noncopyable
 {
     struct node_base
     {

include/mapnik/agg_pattern_source.hpp

@@ -25,9 +25,7 @@
 
 // mapnik
 #include <mapnik/image_data.hpp>
-
+#include <mapnik/noncopyable.hpp>
-// boost
-#include <boost/utility.hpp>
 
 // 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)

include/mapnik/agg_rasterizer.hpp

@@ -23,15 +23,15 @@
 #ifndef MAPNIK_AGG_RASTERIZER_HPP
 #define MAPNIK_AGG_RASTERIZER_HPP
 
-// boost
+// mapnik
-#include <boost/utility.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // 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 {};
 
 }
 

include/mapnik/agg_renderer.hpp

@@ -30,9 +30,9 @@
 #include <mapnik/label_collision_detector.hpp>
 #include <mapnik/map.hpp>
 #include <mapnik/rule.hpp> // for all symbolizers
+#include <mapnik/noncopyable.hpp>
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
@@ -53,7 +53,7 @@ struct rasterizer;
 
 template <typename T>
 class MAPNIK_DECL agg_renderer : public feature_style_processor<agg_renderer<T> >,
-                                 private boost::noncopyable
+                                 private mapnik::noncopyable
 {
 
 public:

include/mapnik/attribute_collector.hpp

@@ -26,8 +26,9 @@
 // mapnik
 #include <mapnik/rule.hpp>
 #include <mapnik/transform_processor.hpp>
+#include <mapnik/noncopyable.hpp>
+
 // boost
-#include <boost/utility.hpp>
 #include <boost/variant.hpp>
 #include <boost/concept_check.hpp>
 // stl
@@ -206,7 +207,7 @@ private:
 };
 
 
-class attribute_collector : public boost::noncopyable
+class attribute_collector : public mapnik::noncopyable
 {
 private:
     std::set<std::string>& names_;

include/mapnik/cairo_renderer.hpp

@@ -32,13 +32,13 @@
 #include <mapnik/label_collision_detector.hpp>
 #include <mapnik/map.hpp>
 #include <mapnik/rule.hpp> // for all symbolizers
+#include <mapnik/noncopyable.hpp>
 
 // cairo
 #include <cairomm/context.h>
 #include <cairomm/surface.h>
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
 
 // FIXME
@@ -57,7 +57,7 @@ class cairo_face;
 
 typedef boost::shared_ptr<cairo_face> cairo_face_ptr;
 
-class cairo_face_manager : private boost::noncopyable
+class cairo_face_manager : private mapnik::noncopyable
 {
 public:
     cairo_face_manager(boost::shared_ptr<freetype_engine> 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<Cairo::Context> const& context, double scale_factor=1.0, unsigned offset_x=0, unsigned offset_y=0);

include/mapnik/datasource.hpp

@@ -29,9 +29,9 @@
 #include <mapnik/feature.hpp>
 #include <mapnik/query.hpp>
 #include <mapnik/feature_layer_desc.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
 
 // stl
@@ -42,7 +42,7 @@ namespace mapnik {
 
 typedef MAPNIK_DECL boost::shared_ptr<Feature> 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 {

include/mapnik/datasource_cache.hpp

@@ -28,9 +28,9 @@
 #include <mapnik/params.hpp>
 #include <mapnik/plugin.hpp>
 #include <mapnik/datasource.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
 
 // stl
@@ -40,7 +40,7 @@ namespace mapnik {
 
 class MAPNIK_DECL datasource_cache
     : public singleton<datasource_cache, CreateStatic>,
-      private boost::noncopyable
+      private mapnik::noncopyable
 {
     friend class CreateStatic<datasource_cache>;
 public:

include/mapnik/debug.hpp

@@ -26,9 +26,9 @@
 // mapnik (should not depend on anything that need to use this)
 #include <mapnik/config.hpp>
 #include <mapnik/utils.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/unordered_map.hpp>
 #ifdef MAPNIK_THREADSAFE
 #include <boost/thread/mutex.hpp>
@@ -50,7 +50,7 @@ namespace mapnik {
     */
     class MAPNIK_DECL logger :
         public singleton<logger,CreateStatic>,
-        private boost::noncopyable
+        private mapnik::noncopyable
     {
     public:
         enum severity_type
@@ -186,7 +186,7 @@ namespace mapnik {
                  class Ch = char,
                  class Tr = std::char_traits<Ch>,
                  class A = std::allocator<Ch> >
-        class base_log : public boost::noncopyable
+        class base_log : public mapnik::noncopyable
         {
         public:
             typedef OutputPolicy<Ch, Tr, A> output_policy;
@@ -245,7 +245,7 @@ namespace mapnik {
                  class Ch = char,
                  class Tr = std::char_traits<Ch>,
                  class A = std::allocator<Ch> >
-        class base_log_always : public boost::noncopyable
+        class base_log_always : public mapnik::noncopyable
         {
         public:
             typedef OutputPolicy<Ch, Tr, A> output_policy;

include/mapnik/feature.hpp

@@ -29,6 +29,8 @@
 #include <mapnik/geometry.hpp>
 #include <mapnik/raster.hpp>
 #include <mapnik/feature_kv_iterator.hpp>
+#include <mapnik/noncopyable.hpp>
+
 // boost
 #include <boost/version.hpp>
 #if BOOST_VERSION >= 104000
@@ -36,7 +38,7 @@
 #else
 #include <boost/property_map.hpp>
 #endif
-#include <boost/utility.hpp>
+
 #include <boost/shared_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
 
@@ -52,7 +54,7 @@ typedef boost::shared_ptr<raster> raster_ptr;
 class feature_impl;
 
 template <typename T>
-class context : private boost::noncopyable,
+class context : private mapnik::noncopyable,
                 public boost::associative_property_map<T>
 
 {
@@ -95,7 +97,7 @@ typedef MAPNIK_DECL boost::shared_ptr<context_type> 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:

include/mapnik/font_engine_freetype.hpp

@@ -32,6 +32,7 @@
 #include <mapnik/char_info.hpp>
 #include <mapnik/pixel_position.hpp>
 #include <mapnik/image_compositing.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // freetype2
 extern "C"
@@ -45,7 +46,6 @@ extern "C"
 // boost
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
-#include <boost/utility.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/foreach.hpp>
 #ifdef MAPNIK_THREADSAFE
@@ -69,7 +69,7 @@ class string_info;
 
 typedef boost::shared_ptr<font_face> 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<font_glyph> 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 <typename T>
-class MAPNIK_DECL face_manager : private boost::noncopyable
+class MAPNIK_DECL face_manager : private mapnik::noncopyable
 {
     typedef T font_engine_type;
     typedef std::map<std::string,face_ptr> face_ptr_cache_type;
@@ -351,9 +351,9 @@ private:
 };
 
 template <typename T>
-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;

include/mapnik/formatting/registry.hpp

@@ -25,9 +25,7 @@
 // mapnik
 #include <mapnik/utils.hpp>
 #include <mapnik/formatting/base.hpp>
-
+#include <mapnik/noncopyable.hpp>
-// boost
-#include <boost/utility.hpp>
 
 // stl
 #include <string>
@@ -41,7 +39,7 @@ namespace formatting
 typedef node_ptr (*from_xml_function_ptr)(xml_node const& xml);
 
 class registry : public singleton<registry, CreateStatic>,
-                 private boost::noncopyable
+                 private mapnik::noncopyable
 {
 public:
     registry();

include/mapnik/geometry.hpp

@@ -26,10 +26,10 @@
 // mapnik
 #include <mapnik/vertex_vector.hpp>
 #include <mapnik/box2d.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
 #include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 
 namespace mapnik {
@@ -42,7 +42,7 @@ enum eGeomType {
 };
 
 template <typename T, template <typename> class Container=vertex_vector>
-class geometry : private::boost::noncopyable
+class geometry : private::mapnik::noncopyable
 {
 public:
     typedef T coord_type;

include/mapnik/grid/grid_rasterizer.hpp

@@ -23,12 +23,12 @@
 #ifndef MAPNIK_GRID_RASTERIZER_HPP
 #define MAPNIK_GRID_RASTERIZER_HPP
 
-#include <boost/utility.hpp>
+#include <mapnik/noncopyable.hpp>
 #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 {};
 
 }
 

include/mapnik/grid/grid_renderer.hpp

@@ -31,9 +31,9 @@
 #include <mapnik/map.hpp>
 #include <mapnik/rule.hpp> // for all symbolizers
 #include <mapnik/grid/grid.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
 
 // FIXME
@@ -52,7 +52,7 @@ struct grid_rasterizer;
 
 template <typename T>
 class MAPNIK_DECL grid_renderer : public feature_style_processor<grid_renderer<T> >,
-                                  private boost::noncopyable
+                                  private mapnik::noncopyable
 {
 
 public:

include/mapnik/hextree.hpp

@@ -26,9 +26,9 @@
 // mapnik
 #include <mapnik/global.hpp>
 #include <mapnik/palette.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/version.hpp>
 #include <boost/unordered_map.hpp>
 #if BOOST_VERSION >= 104600
@@ -60,7 +60,7 @@ struct RGBAPolicy
 };
 
 template <typename T, typename InsertPolicy = RGBAPolicy >
-class hextree : private boost::noncopyable
+class hextree : private mapnik::noncopyable
 {
     struct node
     {

include/mapnik/json/feature_collection_grammar.hpp

@@ -25,6 +25,7 @@
 
 // mapnik
 #include <mapnik/json/feature_grammar.hpp>
+#include <mapnik/feature.hpp>
 
 // spirit::qi
 #include <boost/config/warning_disable.hpp>
@@ -88,7 +89,7 @@ struct feature_collection_grammar :
             > lit(']')
             ;
         
-        feature = eps[_a = construct<feature_ptr>(new_<feature_impl>(ctx_,generate_id_()))]
+        feature = eps[_a = construct<mapnik::feature_ptr>(new_<mapnik::feature_impl>(ctx_,generate_id_()))]
             >> feature_g(*_a)[push_back(_r1,_a)]
             ;
         

include/mapnik/json/feature_collection_parser.hpp

@@ -27,10 +27,11 @@
 #include <mapnik/config.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/datasource.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
 #include <boost/scoped_ptr.hpp>
-#include <boost/utility.hpp>
+
 // stl
 #include <vector>
 
@@ -39,7 +40,7 @@ namespace mapnik { namespace json {
 template <typename Iterator, typename FeatureType> struct feature_collection_grammar;
 
 template <typename Iterator>
-class feature_collection_parser : private boost::noncopyable
+class feature_collection_parser : private mapnik::noncopyable
 {
     typedef Iterator iterator_type;
     typedef mapnik::Feature feature_type;

include/mapnik/json/geojson_generator.hpp

@@ -25,8 +25,9 @@
 
 #include <mapnik/config.hpp>
 #include <mapnik/feature.hpp>
+#include <mapnik/noncopyable.hpp>
+
 #include <boost/scoped_ptr.hpp>
-#include <boost/utility.hpp>
 #include <string>
 
 namespace mapnik { namespace json {
@@ -36,7 +37,7 @@ namespace mapnik { namespace json {
 template <typename OutputIterator> struct feature_generator_grammar;
 template <typename OutputIterator> 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<std::string> sink_type;
 public:
@@ -47,7 +48,7 @@ private:
     boost::scoped_ptr<feature_generator_grammar<sink_type> > grammar_;
 };
 
-class MAPNIK_DECL geometry_generator : private boost::noncopyable
+class MAPNIK_DECL geometry_generator : private mapnik::noncopyable
 {
     typedef std::back_insert_iterator<std::string> 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() {}

include/mapnik/json/geometry_parser.hpp

@@ -26,10 +26,11 @@
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/geometry.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
 #include <boost/scoped_ptr.hpp>
-#include <boost/utility.hpp>
+
 // stl
 //#include <vector>
 
@@ -40,7 +41,7 @@ template <typename Iterator> struct geometry_grammar;
 MAPNIK_DECL bool from_geojson(std::string const& json, boost::ptr_vector<geometry_type> & paths);
 
 template <typename Iterator>
-class MAPNIK_DECL geometry_parser : private boost::noncopyable
+class MAPNIK_DECL geometry_parser : private mapnik::noncopyable
 {
     typedef Iterator iterator_type;
 public:

include/mapnik/label_collision_detector.hpp

@@ -25,6 +25,7 @@
 
 // mapnik
 #include <mapnik/quad_tree.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // stl
 #include <vector>
@@ -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<box2d<double> > 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<double> > 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

include/mapnik/mapped_memory_cache.hpp

@@ -26,9 +26,9 @@
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/utils.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/unordered_map.hpp>
 #include <boost/interprocess/mapped_region.hpp>
 #include <boost/shared_ptr.hpp>
@@ -43,7 +43,7 @@ typedef boost::shared_ptr<mapped_region> mapped_region_ptr;
 
 struct MAPNIK_DECL mapped_memory_cache :
         public singleton<mapped_memory_cache, CreateStatic>,
-        private boost::noncopyable
+        private mapnik::noncopyable
 {
     friend class CreateStatic<mapped_memory_cache>;
     boost::unordered_map<std::string,mapped_region_ptr> cache_;

include/mapnik/marker.hpp

@@ -29,12 +29,12 @@
 #include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/svg/svg_storage.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // agg
 #include "agg_path_storage.h"
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/unordered_map.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
@@ -55,7 +55,7 @@ typedef boost::shared_ptr<image_data_32> 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()

include/mapnik/marker_cache.hpp

@@ -26,9 +26,9 @@
 // mapnik
 #include <mapnik/utils.hpp>
 #include <mapnik/config.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/unordered_map.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
@@ -43,7 +43,7 @@ typedef boost::shared_ptr<marker> marker_ptr;
 
 class MAPNIK_DECL marker_cache :
         public singleton <marker_cache, CreateUsingNew>,
-        private boost::noncopyable
+        private mapnik::noncopyable
 {
     friend class CreateUsingNew<marker_cache>;
 private:

include/mapnik/markers_placement.hpp

@@ -30,9 +30,7 @@
 #include <mapnik/label_collision_detector.hpp>
 #include <mapnik/global.hpp> //round
 #include <mapnik/box2d.hpp>
-
+#include <mapnik/noncopyable.hpp>
-// boost
-#include <boost/utility.hpp>
 
 // agg
 #include "agg_basics.h"
@@ -48,7 +46,7 @@
 namespace mapnik {
 
 template <typename Locator, typename Detector>
-class markers_placement : boost::noncopyable
+class markers_placement : mapnik::noncopyable
 {
 public:
     /** Constructor for markers_placement object.

include/mapnik/octree.hpp

@@ -26,9 +26,7 @@
 // mapnik
 #include <mapnik/global.hpp>
 #include <mapnik/palette.hpp>
-
+#include <mapnik/noncopyable.hpp>
-// boost
-#include <boost/utility.hpp>
 
 // stl
 #include <vector>
@@ -51,7 +49,7 @@ struct RGBPolicy
 };
 
 template <typename T, typename InsertPolicy = RGBPolicy >
-class octree : private boost::noncopyable
+class octree : private mapnik::noncopyable
 {
     struct node
     {

include/mapnik/palette.hpp

@@ -26,9 +26,9 @@
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/global.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/unordered_map.hpp>
 
 // stl
@@ -126,7 +126,7 @@ struct rgba
 typedef boost::unordered_map<unsigned, unsigned> 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 };
 

include/mapnik/placement_finder.hpp

@@ -30,6 +30,7 @@
 #include <mapnik/symbolizer_helpers.hpp>
 #include <mapnik/label_collision_detector.hpp>
 #include <mapnik/ctrans.hpp>
+#include <mapnik/noncopyable.hpp>
 
 
 // agg
@@ -54,7 +55,7 @@ typedef label_collision_detector4 DetectorType;
 
 
 template <typename DetectorT>
-class placement_finder : boost::noncopyable
+class placement_finder : mapnik::noncopyable
 {
 public:
     placement_finder(Feature const& feature,

include/mapnik/plugin.hpp

@@ -23,8 +23,8 @@
 #ifndef MAPNIK_PLUGIN_HPP
 #define MAPNIK_PLUGIN_HPP
 
-// boost
+// mapnik
-#include <boost/utility.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // stl
 #include <string>
@@ -34,7 +34,7 @@
 
 namespace mapnik
 {
-class PluginInfo : boost::noncopyable
+class PluginInfo : mapnik::noncopyable
 {
 private:
     std::string name_;

include/mapnik/pool.hpp

@@ -26,10 +26,10 @@
 // mapnik
 #include <mapnik/debug.hpp>
 #include <mapnik/utils.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
 #include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
 #ifdef MAPNIK_THREADSAFE
 #include <boost/thread/mutex.hpp>
 #endif
@@ -65,7 +65,7 @@ private:
 };
 
 template <typename T,template <typename> class Creator>
-class Pool : private boost::noncopyable
+class Pool : private mapnik::noncopyable
 {
     typedef boost::shared_ptr<T> HolderType;
     typedef std::deque<HolderType> ContType;

include/mapnik/processed_text.hpp

@@ -26,11 +26,12 @@
 #include <mapnik/text_properties.hpp>
 #include <mapnik/font_engine_freetype.hpp>
 #include <mapnik/text_path.hpp>
+#include <mapnik/noncopyable.hpp>
 
 namespace mapnik
 {
 
-class processed_text : boost::noncopyable
+class processed_text : mapnik::noncopyable
 {
 public:
     class processed_expression

include/mapnik/proj_transform.hpp

@@ -26,13 +26,11 @@
 // mapnik
 #include <mapnik/projection.hpp>
 #include <mapnik/box2d.hpp>
-
+#include <mapnik/noncopyable.hpp>
-// boost
-#include <boost/utility.hpp>
 
 namespace mapnik {
 
-class MAPNIK_DECL proj_transform : private boost::noncopyable
+class MAPNIK_DECL proj_transform : private mapnik::noncopyable
 {
 public:
     proj_transform(projection const& source,

include/mapnik/quad_tree.hpp

@@ -25,10 +25,10 @@
 
 // mapnik
 #include <mapnik/box2d.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
 #include <boost/ptr_container/ptr_vector.hpp>
-#include <boost/noncopyable.hpp>
 
 // stl
 #include <vector>
@@ -37,7 +37,7 @@
 namespace mapnik
 {
 template <typename T>
-class quad_tree : boost::noncopyable
+class quad_tree : mapnik::noncopyable
 {
     struct node
     {

include/mapnik/raster.hpp

@@ -26,12 +26,10 @@
 // mapnik
 #include <mapnik/box2d.hpp>
 #include <mapnik/image_data.hpp>
-
+#include <mapnik/noncopyable.hpp>
-// boost
-#include <boost/utility.hpp>
 
 namespace mapnik {
-class raster : private boost::noncopyable
+class raster : private mapnik::noncopyable
 {
 public:
     box2d<double> ext_;

include/mapnik/simplify_converter.hpp

@@ -5,6 +5,7 @@
 #include <mapnik/box2d.hpp>
 #include <mapnik/vertex.hpp>
 #include <mapnik/simplify.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // STL
 #include <limits>
@@ -17,7 +18,7 @@
 namespace mapnik
 {
 
-struct weighted_vertex : private boost::noncopyable
+struct weighted_vertex : private mapnik::noncopyable
 {
     vertex2d coord;
     double weight;

include/mapnik/svg/output/svg_generator.hpp

@@ -30,9 +30,8 @@
 #include <mapnik/util/geometry_svg_generator.hpp>
 #include <mapnik/svg/output/svg_output_grammars.hpp>
 #include <mapnik/svg/output/svg_output_attributes.hpp>
+#include <mapnik/noncopyable.hpp>
 
-// boost
-#include <boost/utility.hpp>
 
 namespace mapnik { namespace svg {
 
@@ -43,7 +42,7 @@ namespace mapnik { namespace svg {
      * structure.
      */
     template <typename OutputIterator>
-    class svg_generator : private boost::noncopyable
+    class svg_generator : private mapnik::noncopyable
     {
         typedef svg::svg_root_attributes_grammar<OutputIterator> root_attributes_grammar;
         typedef svg::svg_rect_attributes_grammar<OutputIterator> rect_attributes_grammar;

include/mapnik/svg/output/svg_renderer.hpp

@@ -28,6 +28,7 @@
 #include <mapnik/map.hpp>
 #include <mapnik/svg/output/svg_generator.hpp>
 #include <mapnik/svg/output/svg_output_attributes.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // stl
 #include <string>
@@ -39,7 +40,7 @@ namespace mapnik
 // can target many other output destinations besides streams.
 template <typename OutputIterator>
 class MAPNIK_DECL svg_renderer : public feature_style_processor<svg_renderer<OutputIterator> >,
-                                 private boost::noncopyable
+                                 private mapnik::noncopyable
 {
 public:
     typedef svg_renderer<OutputIterator> processor_impl_type;

include/mapnik/svg/svg_converter.hpp

@@ -26,9 +26,7 @@
 // mapnik
 #include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
-
+#include <mapnik/noncopyable.hpp>
-// boost
-#include <boost/utility.hpp>
 
 // agg
 #include "agg_path_storage.h"
@@ -46,7 +44,7 @@ namespace mapnik {
 namespace svg {
 
 template <typename VertexSource, typename AttributeSource>
-class svg_converter : boost::noncopyable
+class svg_converter : mapnik::noncopyable
 {
 public:
 

include/mapnik/svg/svg_parser.hpp

@@ -28,9 +28,9 @@
 #include <mapnik/svg/svg_converter.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
 #include <mapnik/gradient.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
-#include <boost/utility.hpp>
 #include <libxml/xmlreader.h>
 
 // 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);

include/mapnik/svg/svg_path_adapter.hpp

@@ -24,7 +24,7 @@
 #define MAPNIK_SVG_PATH_ADAPTER_HPP
 
 // mapnik
-#include <boost/utility.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // agg
 #include "agg_math.h"
@@ -40,7 +40,7 @@ namespace svg {
 
 using namespace agg;
 
-template<class VertexContainer> class path_adapter : boost::noncopyable
+template<class VertexContainer> class path_adapter : mapnik::noncopyable
 {
 public:
     typedef VertexContainer            container_type;
@@ -838,7 +838,7 @@ void path_adapter<VC>::translate_all_paths(double dx, double dy)
 }
 
 
-template<class Container> class vertex_stl_adapter : boost::noncopyable
+template<class Container> class vertex_stl_adapter : mapnik::noncopyable
 {
 public:
 

include/mapnik/svg/svg_renderer_agg.hpp

@@ -29,9 +29,9 @@
 #include <mapnik/gradient.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/grid/grid_pixel.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/foreach.hpp>
 
 // agg
@@ -100,7 +100,7 @@ private:
 };
 
 template <typename VertexSource, typename AttributeSource, typename ScanlineRenderer, typename PixelFormat>
-class svg_renderer_agg : boost::noncopyable
+class svg_renderer_agg : mapnik::noncopyable
 {
 public:
     typedef agg::conv_curve<VertexSource>            curved_type;

include/mapnik/svg/svg_storage.hpp

@@ -25,15 +25,13 @@
 
 // mapnik
 #include <mapnik/box2d.hpp>
-
+#include <mapnik/noncopyable.hpp>
-// boost
-#include <boost/utility.hpp>
 
 namespace mapnik {
 namespace svg {
 
 template <typename VertexSource ,typename AttributeSource>
-class svg_storage :  boost::noncopyable
+class svg_storage :  mapnik::noncopyable
 {
 public:
     svg_storage() {}

include/mapnik/text_path.hpp

@@ -26,12 +26,12 @@
 // mapnik
 #include <mapnik/char_info.hpp>
 #include <mapnik/pixel_position.hpp>
+#include <mapnik/noncopyable.hpp>
 
 //stl
 #include <vector>
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
 
 // uci
@@ -40,7 +40,7 @@
 namespace mapnik
 {
 
-class string_info : private boost::noncopyable
+class string_info : private mapnik::noncopyable
 {
 protected:
     typedef std::vector<char_info> 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
     {

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

include/mapnik/text_placements/registry.hpp

@@ -25,9 +25,7 @@
 // mapnik
 #include <mapnik/utils.hpp>
 #include <mapnik/text_placements/base.hpp>
-
+#include <mapnik/noncopyable.hpp>
-// boost
-#include <boost/utility.hpp>
 
 // stl
 #include <string>
@@ -42,7 +40,7 @@ typedef text_placements_ptr (*from_xml_function_ptr)(
     xml_node const& xml, fontset_map const & fontsets);
 
 class registry : public singleton<registry, CreateStatic>,
-                 private boost::noncopyable
+                 private mapnik::noncopyable
 {
 public:
     registry();

include/mapnik/unicode.hpp

@@ -25,13 +25,13 @@
 
 //mapnik
 #include <mapnik/config.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // icu
 #include <unicode/unistr.h>
 #include <unicode/ucnv.h>
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/cstdint.hpp>
 
 // 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);

include/mapnik/vertex_converters.hpp

@@ -44,13 +44,13 @@
 #include <boost/fusion/include/make_vector.hpp>
 
 #include <boost/foreach.hpp>
-#include <boost/utility.hpp>
 #include <boost/array.hpp>
 
 // mapnik
 #include <mapnik/agg_helpers.hpp>
 #include <mapnik/offset_converter.hpp>
 #include <mapnik/simplify_converter.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // agg
 #include "agg_conv_clip_polygon.h"
@@ -317,7 +317,7 @@ struct dispatcher
 
 
 template <typename B, typename R, typename S, typename T, typename P, typename A, typename C >
-struct vertex_converter : private boost::noncopyable
+struct vertex_converter : private mapnik::noncopyable
 {
     typedef C conv_types;
     typedef B bbox_type;

include/mapnik/vertex_vector.hpp

@@ -29,9 +29,9 @@
 
 // mapnik
 #include <mapnik/vertex.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/tuple/tuple.hpp>
 
 #include <cstring>  // required for memcpy with linux/g++
@@ -40,7 +40,7 @@ namespace mapnik
 {
 
 template <typename T>
-class vertex_vector : private boost::noncopyable
+class vertex_vector : private mapnik::noncopyable
 {
     typedef T coord_type;
     typedef vertex<coord_type,2> vertex_type;

include/mapnik/wkb.hpp

@@ -25,9 +25,7 @@
 
 // mapnik
 #include <mapnik/geometry.hpp>
-
+#include <mapnik/noncopyable.hpp>
-// boost
-#include <boost/utility.hpp>
 
 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:
 

include/mapnik/wkt/wkt_factory.hpp

@@ -27,8 +27,9 @@
 #include <mapnik/config.hpp>
 #include <mapnik/geometry.hpp>
 #include <mapnik/wkt/wkt_grammar.hpp>
+#include <mapnik/noncopyable.hpp>
+
 // boost
-#include <boost/utility.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/version.hpp>
@@ -42,7 +43,7 @@ MAPNIK_DECL bool from_wkt(std::string const& wkt, boost::ptr_vector<geometry_typ
 
 #if BOOST_VERSION >= 104700
 
-class MAPNIK_DECL wkt_parser : boost::noncopyable
+class MAPNIK_DECL wkt_parser : mapnik::noncopyable
 {
     typedef std::string::const_iterator iterator_type;
 public:

plugins/input/shape/dbfile.hpp

@@ -23,9 +23,11 @@
 #ifndef DBFFILE_HPP
 #define DBFFILE_HPP
 
+// mapnik
 #include <mapnik/feature.hpp>
+#include <mapnik/noncopyable.hpp>
+
 // boost
-#include <boost/utility.hpp>
 #include <boost/interprocess/streams/bufferstream.hpp>
 
 // stl
@@ -48,7 +50,7 @@ struct field_descriptor
 };
 
 
-class dbf_file : private boost::noncopyable
+class dbf_file : private mapnik::noncopyable
 {
 private:
     int num_records_;

plugins/input/shape/shape_io.hpp

@@ -26,16 +26,16 @@
 // mapnik
 #include <mapnik/geometry.hpp>
 #include <mapnik/datasource.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
 
 #include "dbfile.hpp"
 #include "shapefile.hpp"
 #include "shp_index.hpp"
 
-struct shape_io : boost::noncopyable
+struct shape_io : mapnik::noncopyable
 {
 public:
     enum shapeType

plugins/input/shape/shapefile.hpp

@@ -31,9 +31,9 @@
 #include <mapnik/global.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/mapped_memory_cache.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/interprocess/streams/bufferstream.hpp>
 
@@ -130,7 +130,7 @@ struct shape_record
 
 using namespace boost::interprocess;
 
-class shape_file : boost::noncopyable
+class shape_file : mapnik::noncopyable
 {
 public:
 

plugins/input/sqlite/sqlite_prepared.hpp

@@ -27,10 +27,10 @@
 #include <mapnik/datasource.hpp>
 #include <mapnik/params.hpp>
 #include <mapnik/box2d.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
 #include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
 
 // stl
 #include <string.h>
@@ -42,7 +42,7 @@ extern "C" {
 #include <sqlite3.h>
 }
 
-class prepared_index_statement : boost::noncopyable
+class prepared_index_statement : mapnik::noncopyable
 {
 
 public:

src/agg/process_line_pattern_symbolizer.cpp

@@ -31,6 +31,7 @@
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/line_pattern_symbolizer.hpp>
 #include <mapnik/vertex_converters.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // agg
 #include "agg_basics.h"
@@ -47,12 +48,11 @@
 #include "agg_conv_clip_polyline.h"
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/foreach.hpp>
 
 namespace {
 
-class pattern_source : private boost::noncopyable
+class pattern_source : private mapnik::noncopyable
 {
 public:
     pattern_source(mapnik::image_data_32 const& pattern)

src/cairo_renderer.cpp

@@ -44,6 +44,7 @@
 #include <mapnik/text_path.hpp>
 #include <mapnik/vertex_converters.hpp>
 #include <mapnik/marker_helpers.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // cairo
 #include <cairomm/context.h>
@@ -52,7 +53,6 @@
 #include <cairo-version.h>
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/math/special_functions/round.hpp>
 
@@ -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<Cairo::SurfacePattern> 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<freetype_engine> 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<Cairo::Context> const& context)

src/jpeg_reader.cpp

@@ -23,6 +23,7 @@
 // mapnik
 #include <mapnik/image_reader.hpp>
 #include <mapnik/color.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // jpeg
 extern "C"
@@ -32,14 +33,13 @@ extern "C"
 
 // boost
 #include <boost/scoped_array.hpp>
-#include <boost/utility.hpp>
 
 // std
 #include <cstdio>
 
 namespace mapnik
 {
-class JpegReader : public image_reader, boost::noncopyable
+class JpegReader : public image_reader, mapnik::noncopyable
 {
 private:
     std::string fileName_;

src/libxml2_loader.cpp

@@ -27,9 +27,9 @@
 #include <mapnik/xml_node.hpp>
 #include <mapnik/config_error.hpp>
 #include <mapnik/util/trim.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/filesystem/operations.hpp>
 
 // 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) :

src/load_map.cpp

@@ -50,6 +50,7 @@
 #include <mapnik/util/conversions.hpp>
 #include <mapnik/util/trim.hpp>
 #include <mapnik/marker_cache.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
 #include <boost/optional.hpp>
@@ -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),

src/png_reader.cpp

@@ -22,6 +22,7 @@
 
 #include <mapnik/debug.hpp>
 #include <mapnik/image_reader.hpp>
+#include <mapnik/noncopyable.hpp>
 
 extern "C"
 {
@@ -29,11 +30,10 @@ extern "C"
 }
 
 #include <boost/scoped_array.hpp>
-#include <boost/utility.hpp>
 
 namespace mapnik
 {
-class png_reader : public image_reader, boost::noncopyable
+class png_reader : public image_reader, mapnik::noncopyable
 {
 private:
     std::string fileName_;

src/rapidxml_loader.cpp

@@ -32,9 +32,7 @@
 #include <mapnik/xml_node.hpp>
 #include <mapnik/config_error.hpp>
 #include <mapnik/util/trim.hpp>
-
+#include <mapnik/noncopyable.hpp>
-// boost
-#include <boost/utility.hpp>
 
 // stl
 #include <iostream>
@@ -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) :

src/wkb.cpp

@@ -27,9 +27,9 @@
 #include <mapnik/coord_array.hpp>
 #include <mapnik/geom_util.hpp>
 #include <mapnik/feature.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/format.hpp>
 
 namespace mapnik
@@ -37,7 +37,7 @@ namespace mapnik
 
 typedef coord_array<coord2d> CoordinateArray;
 
-struct wkb_reader : boost::noncopyable
+struct wkb_reader : mapnik::noncopyable
 {
 private:
     enum wkbByteOrder {

utils/pgsql2sqlite/sqlite.hpp

@@ -20,10 +20,11 @@
  *
  *****************************************************************************/
 
+#include <mapnik/noncopyable.hpp>
 // boost
 #include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
 #include <boost/variant.hpp>
+
 //sqlite3
 #include <sqlite3.h>
 
@@ -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<int,double,std::string, blob,null_type> value_type;
     typedef std::vector<value_type> record_type;
 
-    class prepared_statement : boost::noncopyable
+    class prepared_statement : mapnik::noncopyable
     {
         struct binder : public boost::static_visitor<bool>
         {