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

Merge branch 'master' into image

Browse source
This commit is contained in:
artemp 2015-01-07 17:49:51 +01:00
commit cd0ac2d0f6
80 changed files with 179 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bindings/python/python_optional.hpp
View file

@ -23,7 +23,7 @@
#include <boost/optional/optional.hpp>
#include <boost/python.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// boost::optional<T> to/from converter from John Wiegley
@ -47,7 +47,7 @@ struct register_python_conversion
};
template <typename T>
struct python_optional : public mapnik::noncopyable
struct python_optional : public mapnik::util::noncopyable
{
struct optional_to_python
{
@ -104,7 +104,7 @@ struct python_optional : public mapnik::noncopyable
// to/from boost::optional<bool>
template <>
struct python_optional<float> : public mapnik::noncopyable
struct python_optional<float> : public mapnik::util::noncopyable
{
struct optional_to_python
{
@ -149,7 +149,7 @@ struct python_optional<float> : public mapnik::noncopyable
// to/from boost::optional<float>
template <>
struct python_optional<bool> : public mapnik::noncopyable
struct python_optional<bool> : public mapnik::util::noncopyable
{
struct optional_to_python
{

4
demo/viewer/styles_model.cpp
View file

@ -22,7 +22,7 @@
#include <mapnik/config.hpp>
#include <mapnik/util/variant.hpp>
#include <mapnik/expression_string.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/rule.hpp>
#include <mapnik/feature_type_style.hpp>
#include <mapnik/symbolizer.hpp>
@ -35,7 +35,7 @@
#include <QPainter>
#include <QPixmap>
class node : private mapnik::noncopyable
class node : private util::noncopyable
{
struct node_base
{

4
include/mapnik/agg_pattern_source.hpp
View file

@ -25,7 +25,7 @@
// mapnik
#include <mapnik/image_data.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// agg
#include "agg_color_rgba.h"
@ -33,7 +33,7 @@
namespace mapnik
{
class pattern_source : private mapnik::noncopyable
class pattern_source : private util::noncopyable
{
public:
pattern_source(image_data_rgba8 const& pattern, double opacity = 1.0)

4
include/mapnik/agg_rasterizer.hpp
View file

@ -24,14 +24,14 @@
#define MAPNIK_AGG_RASTERIZER_HPP
// mapnik
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// agg
#include "agg_rasterizer_scanline_aa.h"
namespace mapnik {
struct rasterizer : agg::rasterizer_scanline_aa<agg::rasterizer_sl_clip_int_sat>, mapnik::noncopyable {};
struct rasterizer : agg::rasterizer_scanline_aa<agg::rasterizer_sl_clip_int_sat>, util::noncopyable {};
}

4
include/mapnik/agg_renderer.hpp
View file

@ -26,7 +26,7 @@
// mapnik
#include <mapnik/config.hpp> // for MAPNIK_DECL
#include <mapnik/feature_style_processor.hpp>
#include <mapnik/noncopyable.hpp> // for noncopyable
#include <mapnik/util/noncopyable.hpp> // for noncopyable
#include <mapnik/rule.hpp> // for rule, symbolizers
#include <mapnik/box2d.hpp> // for box2d
#include <mapnik/color.hpp> // for color
@ -60,7 +60,7 @@ namespace mapnik {
template <typename T0, typename T1=label_collision_detector4>
class MAPNIK_DECL agg_renderer : public feature_style_processor<agg_renderer<T0> >,
private mapnik::noncopyable
private util::noncopyable
{
public:

6
include/mapnik/attribute_collector.hpp
View file

@ -25,7 +25,7 @@
// mapnik
#include <mapnik/transform_processor.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/attribute.hpp>
#include <mapnik/symbolizer.hpp>
#include <mapnik/expression.hpp> // for expression_ptr, etc
@ -92,7 +92,7 @@ private:
Container& names_;
};
class group_attribute_collector : public mapnik::noncopyable
class group_attribute_collector : public util::noncopyable
{
private:
std::set<std::string>& names_;
@ -209,7 +209,7 @@ private:
};
class attribute_collector : public mapnik::noncopyable
class attribute_collector : public util::noncopyable
{
private:
std::set<std::string> & names_;

12
include/mapnik/cairo/cairo_context.hpp
View file

@ -33,7 +33,7 @@
#include <mapnik/gradient.hpp>
#include <mapnik/text/glyph_positions.hpp>
#include <mapnik/vertex.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/symbolizer_base.hpp>
#include <mapnik/symbolizer_enumerations.hpp>
@ -75,7 +75,7 @@ void check_object_status_and_throw_exception(T const& object)
check_status_and_throw_exception(object.get_status());
}
class cairo_face : private mapnik::noncopyable
class cairo_face : private util::noncopyable
{
public:
cairo_face(std::shared_ptr<font_library> const& library, face_ptr const& face);
@ -106,7 +106,7 @@ private:
using cairo_face_ptr = std::shared_ptr<cairo_face>;
class cairo_face_manager : private mapnik::noncopyable
class cairo_face_manager : private util::noncopyable
{
public:
cairo_face_manager(std::shared_ptr<font_library> library);
@ -118,7 +118,7 @@ private:
cairo_face_cache cache_;
};
class cairo_pattern : private mapnik::noncopyable
class cairo_pattern : private util::noncopyable
{
public:
explicit cairo_pattern(image_data_rgba8 const& data, double opacity = 1.0)
@ -192,7 +192,7 @@ private:
};
class cairo_gradient : private mapnik::noncopyable
class cairo_gradient : private util::noncopyable
{
public:
cairo_gradient(mapnik::gradient const& grad, double opacity=1.0)
@ -276,7 +276,7 @@ inline cairo_ptr create_context(cairo_surface_ptr const& surface)
return cairo_ptr(cairo_create(&*surface),cairo_closer());
}
class cairo_context : private mapnik::noncopyable
class cairo_context : private util::noncopyable
{
public:

4
include/mapnik/cairo/cairo_renderer.hpp
View file

@ -28,7 +28,7 @@
// mapnik
#include <mapnik/config.hpp>
#include <mapnik/feature_style_processor.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/rule.hpp> // for all symbolizers
#include <mapnik/cairo/cairo_context.hpp>
#include <mapnik/renderer_common.hpp>
@ -67,7 +67,7 @@ struct cairo_save_restore
template <typename T>
class MAPNIK_DECL cairo_renderer : public feature_style_processor<cairo_renderer<T> >,
private mapnik::noncopyable
private util::noncopyable
{
public:
using processor_impl_type = cairo_renderer<T>;

4
include/mapnik/datasource.hpp
View file

@ -30,7 +30,7 @@
#include <mapnik/query.hpp>
#include <mapnik/featureset.hpp>
#include <mapnik/feature_layer_desc.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/feature_style_processor_context.hpp>
// boost
@ -63,7 +63,7 @@ private:
std::string message_;
};
class MAPNIK_DECL datasource : private mapnik::noncopyable
class MAPNIK_DECL datasource : private util::noncopyable
{
public:
enum datasource_t : std::uint8_t {

4
include/mapnik/datasource_cache.hpp
View file

@ -26,7 +26,7 @@
// mapnik
#include <mapnik/config.hpp>
#include <mapnik/utils.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// stl
#include <map>
@ -42,7 +42,7 @@ class PluginInfo;
class MAPNIK_DECL datasource_cache
: public singleton<datasource_cache, CreateStatic>,
private mapnik::noncopyable
private util::noncopyable
{
friend class CreateStatic<datasource_cache>;
public:

8
include/mapnik/debug.hpp
View file

@ -27,7 +27,7 @@
#include <mapnik/config.hpp>
#include <mapnik/unique_lock.hpp>
#include <mapnik/utils.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// std
#include <iostream>
@ -48,7 +48,7 @@ namespace mapnik {
*/
class MAPNIK_DECL logger :
public singleton<logger,CreateStatic>,
private mapnik::noncopyable
private util::noncopyable
{
public:
enum severity_type
@ -184,7 +184,7 @@ namespace mapnik {
class Ch = char,
class Tr = std::char_traits<Ch>,
class A = std::allocator<Ch> >
class base_log : public mapnik::noncopyable
class base_log : public util::noncopyable
{
public:
using output_policy = OutputPolicy<Ch, Tr, A>;
@ -254,7 +254,7 @@ namespace mapnik {
class Ch = char,
class Tr = std::char_traits<Ch>,
class A = std::allocator<Ch> >
class base_log_always : public mapnik::noncopyable
class base_log_always : public util::noncopyable
{
public:
using output_policy = OutputPolicy<Ch, Tr, A>;

4
include/mapnik/evaluate_global_attributes.hpp
View file

@ -30,7 +30,7 @@
#include <mapnik/attribute.hpp>
#include <mapnik/expression_node.hpp>
#include <mapnik/color_factory.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/function_call.hpp>
#include <mapnik/util/variant.hpp>
@ -271,7 +271,7 @@ std::tuple<T,bool> pre_evaluate_expression (expression_ptr const& expr)
}
}
struct evaluate_global_attributes : mapnik::noncopyable
struct evaluate_global_attributes : util::noncopyable
{
template <typename Attributes>
struct evaluator

6
include/mapnik/feature.hpp
View file

@ -31,7 +31,7 @@
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_container.hpp>
#include <mapnik/feature_kv_iterator.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// stl
#include <memory>
@ -49,7 +49,7 @@ class feature_impl;
using raster_ptr = std::shared_ptr<raster>;
template <typename T>
class context : private mapnik::noncopyable
class context : private util::noncopyable
{
friend class feature_impl;
@ -90,7 +90,7 @@ using context_ptr = std::shared_ptr<context_type>;
static const value default_feature_value;
class MAPNIK_DECL feature_impl : private mapnik::noncopyable
class MAPNIK_DECL feature_impl : private util::noncopyable
{
friend class feature_kv_iterator;
public:

4
include/mapnik/featureset.hpp
View file

@ -25,7 +25,7 @@
// mapnik
#include <mapnik/config.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// boost
#include <memory>
@ -35,7 +35,7 @@ namespace mapnik {
class feature_impl;
using feature_ptr = std::shared_ptr<feature_impl>;
struct MAPNIK_DECL Featureset : private mapnik::noncopyable
struct MAPNIK_DECL Featureset : private util::noncopyable
{
virtual feature_ptr next() = 0;
virtual ~Featureset() {}

4
include/mapnik/font_engine_freetype.hpp
View file

@ -27,7 +27,7 @@
#include <mapnik/config.hpp>
#include <mapnik/font_set.hpp>
#include <mapnik/text/font_library.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// stl
#include <memory>
@ -100,7 +100,7 @@ private:
static font_memory_cache_type global_memory_fonts_;
};
class MAPNIK_DECL face_manager : private mapnik::noncopyable
class MAPNIK_DECL face_manager : private util::noncopyable
{
using face_ptr_cache_type = std::map<std::string, face_ptr>;

4
include/mapnik/geometry.hpp
View file

@ -26,12 +26,12 @@
// mapnik
#include <mapnik/vertex_vector.hpp>
#include <mapnik/box2d.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
namespace mapnik {
template <typename T, template <typename> class Container=vertex_vector>
class geometry : private mapnik::noncopyable
class geometry : private util::noncopyable
{
public:

4
include/mapnik/grid/grid_marker_helpers.hpp
View file

@ -42,7 +42,7 @@
namespace mapnik {
template <typename RendererBase, typename RendererType, typename Detector, typename RendererContext>
struct raster_markers_rasterizer_dispatch_grid : mapnik::noncopyable
struct raster_markers_rasterizer_dispatch_grid : util::noncopyable
{
using pixfmt_type = typename RendererBase::pixfmt_type;
using color_type = typename RendererBase::pixfmt_type::color_type;
@ -143,7 +143,7 @@ private:
template <typename SvgRenderer, typename Detector, typename RendererContext>
struct vector_markers_rasterizer_dispatch_grid : mapnik::noncopyable
struct vector_markers_rasterizer_dispatch_grid : util::noncopyable
{
using renderer_base = typename SvgRenderer::renderer_base ;
using vertex_source_type = typename SvgRenderer::vertex_source_type ;

4
include/mapnik/grid/grid_rasterizer.hpp
View file

@ -23,12 +23,12 @@
#ifndef MAPNIK_GRID_RASTERIZER_HPP
#define MAPNIK_GRID_RASTERIZER_HPP
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include "agg_rasterizer_scanline_aa.h"
namespace mapnik {
struct grid_rasterizer : agg::rasterizer_scanline_aa<>, mapnik::noncopyable {};
struct grid_rasterizer : agg::rasterizer_scanline_aa<>, util::noncopyable {};
}

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

@ -27,7 +27,7 @@
#include <mapnik/config.hpp>
#include <mapnik/feature_style_processor.hpp>
#include <mapnik/grid/grid.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/rule.hpp> // for rule, symbolizers
#include <mapnik/box2d.hpp> // for box2d
#include <mapnik/color.hpp> // for color
@ -59,7 +59,7 @@ namespace mapnik {
template <typename T>
class MAPNIK_DECL grid_renderer : public feature_style_processor<grid_renderer<T> >,
private mapnik::noncopyable
private util::noncopyable
{
public:

4
include/mapnik/hextree.hpp
View file

@ -26,7 +26,7 @@
// mapnik
#include <mapnik/global.hpp>
#include <mapnik/palette.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// stl
#include <algorithm>
@ -52,7 +52,7 @@ struct RGBAPolicy
};
template <typename T, typename InsertPolicy = RGBAPolicy >
class hextree : private mapnik::noncopyable
class hextree : private util::noncopyable
{
struct node
{

4
include/mapnik/image_reader.hpp
View file

@ -26,7 +26,7 @@
// mapnik
#include <mapnik/image_data_any.hpp>
#include <mapnik/config.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/factory.hpp>
#include <mapnik/box2d.hpp>
// boost
@ -54,7 +54,7 @@ public:
}
};
struct MAPNIK_DECL image_reader : private mapnik::noncopyable
struct MAPNIK_DECL image_reader : private util::noncopyable
{
virtual unsigned width() const = 0;
virtual unsigned height() const = 0;

8
include/mapnik/label_collision_detector.hpp
View file

@ -25,7 +25,7 @@
// mapnik
#include <mapnik/quad_tree.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/value_types.hpp>
// icu
@ -63,7 +63,7 @@ private:
};
// quad_tree based label collision detector
class label_collision_detector2 : mapnik::noncopyable
class label_collision_detector2 : util::noncopyable
{
using tree_t = quad_tree<box2d<double> >;
tree_t tree_;
@ -92,7 +92,7 @@ public:
};
// quad_tree based label collision detector with seperate check/insert
class label_collision_detector3 : mapnik::noncopyable
class label_collision_detector3 : util::noncopyable
{
using tree_t = quad_tree< box2d<double> >;
tree_t tree_;
@ -126,7 +126,7 @@ public:
//quad tree based label collision detector so labels dont appear within a given distance
class label_collision_detector4 : mapnik::noncopyable
class label_collision_detector4 : util::noncopyable
{
public:
struct label

4
include/mapnik/mapped_memory_cache.hpp
View file

@ -26,7 +26,7 @@
// mapnik
#include <mapnik/config.hpp>
#include <mapnik/utils.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// boost
#include <memory>
@ -42,7 +42,7 @@ using mapped_region_ptr = std::shared_ptr<boost::interprocess::mapped_region>;
class MAPNIK_DECL mapped_memory_cache :
public singleton<mapped_memory_cache, CreateStatic>,
private mapnik::noncopyable
private util::noncopyable
{
friend class CreateStatic<mapped_memory_cache>;
std::unordered_map<std::string,mapped_region_ptr> cache_;

4
include/mapnik/marker.hpp
View file

@ -28,7 +28,7 @@
#include <mapnik/svg/svg_storage.hpp>
#include <mapnik/svg/svg_path_attributes.hpp>
#include <mapnik/svg/svg_path_adapter.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// agg
#include "agg_array.h"
@ -50,7 +50,7 @@ using image_ptr = std::shared_ptr<image_data_rgba8>;
* 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 mapnik::noncopyable
class marker: private util::noncopyable
{
public:
marker()

4
include/mapnik/marker_cache.hpp
View file

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

4
include/mapnik/marker_helpers.hpp
View file

@ -69,7 +69,7 @@ struct clip_poly_tag;
using svg_attribute_type = agg::pod_bvector<svg::path_attributes>;
template <typename SvgRenderer, typename Detector, typename RendererContext>
struct vector_markers_rasterizer_dispatch : mapnik::noncopyable
struct vector_markers_rasterizer_dispatch : util::noncopyable
{
using renderer_base = typename SvgRenderer::renderer_base ;
using vertex_source_type = typename SvgRenderer::vertex_source_type ;
@ -157,7 +157,7 @@ private:
};
template <typename Detector,typename RendererContext>
struct raster_markers_rasterizer_dispatch : mapnik::noncopyable
struct raster_markers_rasterizer_dispatch : util::noncopyable
{
using BufferType = typename std::remove_reference<typename std::tuple_element<0,RendererContext>::type>::type;
using RasterizerType = typename std::tuple_element<1,RendererContext>::type;

2
include/mapnik/markers_placement.hpp
View file

@ -35,7 +35,7 @@ namespace mapnik
{
template <typename Locator, typename Detector>
class markers_placement_finder : mapnik::noncopyable
class markers_placement_finder : util::noncopyable
{
public:
using markers_placement = util::variant<markers_point_placement<Locator, Detector>,

2
include/mapnik/markers_placements/point.hpp
View file

@ -41,7 +41,7 @@ struct markers_placement_params
};
template <typename Locator, typename Detector>
class markers_point_placement : noncopyable
class markers_point_placement : util::noncopyable
{
public:
markers_point_placement(Locator &locator, Detector &detector, markers_placement_params const& params)

4
include/mapnik/octree.hpp
View file

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

4
include/mapnik/palette.hpp
View file

@ -26,7 +26,7 @@
// mapnik
#include <mapnik/config.hpp>
#include <mapnik/global.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#define USE_DENSE_HASH_MAP
@ -103,7 +103,7 @@ struct MAPNIK_DECL rgba
};
class MAPNIK_DECL rgba_palette : private mapnik::noncopyable {
class MAPNIK_DECL rgba_palette : private util::noncopyable {
public:
enum palette_type { PALETTE_RGBA = 0, PALETTE_RGB = 1, PALETTE_ACT = 2 };

4
include/mapnik/plugin.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_PLUGIN_HPP
// mapnik
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// stl
#include <string>
@ -35,7 +35,7 @@ namespace mapnik
// Opaque structure for handle
using mapnik_lib_t = struct _mapnik_lib_t;
class PluginInfo : mapnik::noncopyable
class PluginInfo : util::noncopyable
{
public:
using name_func = const char* (*) ();

4
include/mapnik/pool.hpp
View file

@ -26,7 +26,7 @@
// mapnik
#include <mapnik/unique_lock.hpp>
#include <mapnik/utils.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// boost
#include <memory>
@ -41,7 +41,7 @@
namespace mapnik
{
template <typename T,template <typename> class Creator>
class Pool : private mapnik::noncopyable
class Pool : private util::noncopyable
{
using HolderType = std::shared_ptr<T>;
using ContType = std::deque<HolderType>;

4
include/mapnik/proj_transform.hpp
View file

@ -25,14 +25,14 @@
// mapnik
#include <mapnik/config.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
namespace mapnik {
class projection;
template <typename T> class box2d;
class MAPNIK_DECL proj_transform : private mapnik::noncopyable
class MAPNIK_DECL proj_transform : private util::noncopyable
{
public:
proj_transform(projection const& source,

4
include/mapnik/quad_tree.hpp
View file

@ -25,7 +25,7 @@
// mapnik
#include <mapnik/box2d.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// boost
#pragma GCC diagnostic push
@ -41,7 +41,7 @@
namespace mapnik
{
template <typename T>
class quad_tree : mapnik::noncopyable
class quad_tree : util::noncopyable
{
struct node
{

4
include/mapnik/raster.hpp
View file

@ -26,14 +26,14 @@
// mapnik
#include <mapnik/box2d.hpp>
#include <mapnik/image_data_any.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/util/variant.hpp>
// boost
#include <boost/optional.hpp>
namespace mapnik {
class raster : private mapnik::noncopyable
class raster : private util::noncopyable
{
public:
box2d<double> ext_;

4
include/mapnik/renderer_common.hpp
View file

@ -28,7 +28,7 @@
#include <mapnik/box2d.hpp> // for box2d
#include <mapnik/view_transform.hpp> // for view_transform
#include <mapnik/attribute.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// fwd declarations to speed up compile
namespace mapnik {
@ -40,7 +40,7 @@ namespace mapnik {
namespace mapnik {
struct renderer_common : private mapnik::noncopyable
struct renderer_common : private util::noncopyable
{
renderer_common(Map const &m, attributes const& vars, unsigned offset_x, unsigned offset_y,
unsigned width, unsigned height, double scale_factor);

8
include/mapnik/renderer_common/process_group_symbolizer.hpp
View file

@ -38,7 +38,7 @@
#include <mapnik/util/conversions.hpp>
#include <mapnik/util/variant.hpp>
#include <mapnik/label_collision_detector.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// agg
#include <agg_trans_affine.h>
@ -49,7 +49,7 @@ class proj_transform;
struct glyph_info;
class text_symbolizer_helper;
struct virtual_renderer_common : private mapnik::noncopyable
struct virtual_renderer_common : private util::noncopyable
{
virtual_renderer_common(renderer_common & common) :
@ -97,7 +97,7 @@ struct virtual_renderer_common : private mapnik::noncopyable
// stores all the arguments necessary to re-render this point
// symbolizer at a later time.
struct point_render_thunk : noncopyable
struct point_render_thunk : util::noncopyable
{
pixel_position pos_;
marker_ptr marker_;
@ -118,7 +118,7 @@ struct point_render_thunk : noncopyable
using helper_ptr = std::unique_ptr<text_symbolizer_helper>;
struct text_render_thunk : noncopyable
struct text_render_thunk : util::noncopyable
{
// helper is stored here in order
// to keep in scope the text rendering structures

4
include/mapnik/rule_cache.hpp
View file

@ -25,7 +25,7 @@
// mapnik
#include <mapnik/rule.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// stl
#include <vector>
@ -34,7 +34,7 @@
namespace mapnik
{
class rule_cache : private noncopyable
class rule_cache : private util::noncopyable
{
public:
using rule_ptrs = std::vector<rule const*>;

4
include/mapnik/simplify_converter.hpp
View file

@ -5,7 +5,7 @@
#include <mapnik/config.hpp>
#include <mapnik/vertex.hpp>
#include <mapnik/simplify.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// stl
#include <limits>
@ -19,7 +19,7 @@
namespace mapnik
{
struct weighted_vertex : private mapnik::noncopyable
struct weighted_vertex : private util::noncopyable
{
vertex2d coord;
double weight;

4
include/mapnik/svg/output/svg_generator.hpp
View file

@ -29,7 +29,7 @@
#include <mapnik/geometry.hpp>
#include <mapnik/svg/geometry_svg_generator.hpp>
#include <mapnik/svg/output/svg_output_attributes.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/value_types.hpp>
@ -42,7 +42,7 @@ namespace mapnik { namespace svg {
* structure.
*/
template <typename OutputIterator>
class svg_generator : private mapnik::noncopyable
class svg_generator : private util::noncopyable
{
public:
explicit svg_generator(OutputIterator& output_iterator);

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

@ -28,7 +28,7 @@
#include <mapnik/feature_style_processor.hpp>
#include <mapnik/svg/output/svg_generator.hpp>
#include <mapnik/svg/output/svg_output_attributes.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/rule.hpp> // for rule, symbolizers
#include <mapnik/box2d.hpp> // for box2d
#include <mapnik/color.hpp> // for color
@ -64,7 +64,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 mapnik::noncopyable
private util::noncopyable
{
public:
using processor_impl_type = svg_renderer<OutputIterator>;

4
include/mapnik/svg/svg_converter.hpp
View file

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

4
include/mapnik/svg/svg_parser.hpp
View file

@ -28,14 +28,14 @@
#include <mapnik/svg/svg_converter.hpp>
#include <mapnik/svg/svg_path_adapter.hpp>
#include <mapnik/gradient.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// stl
#include <map>
namespace mapnik { namespace svg {
class svg_parser : private mapnik::noncopyable
class svg_parser : private util::noncopyable
{
public:
explicit svg_parser(svg_converter_type & path);

6
include/mapnik/svg/svg_path_adapter.hpp
View file

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

4
include/mapnik/svg/svg_renderer_agg.hpp
View file

@ -27,7 +27,7 @@
#include <mapnik/svg/svg_path_attributes.hpp>
#include <mapnik/gradient.hpp>
#include <mapnik/box2d.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#if defined(GRID_RENDERER)
#include <mapnik/grid/grid_pixel.hpp>
@ -98,7 +98,7 @@ private:
};
template <typename VertexSource, typename AttributeSource, typename ScanlineRenderer, typename PixelFormat>
class svg_renderer_agg : mapnik::noncopyable
class svg_renderer_agg : util::noncopyable
{
public:
using curved_type = agg::conv_curve<VertexSource> ;

4
include/mapnik/svg/svg_storage.hpp
View file

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

8
include/mapnik/text/face.hpp
View file

@ -25,7 +25,7 @@
//mapnik
#include <mapnik/text/glyph_info.hpp>
#include <mapnik/config.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// freetype2
extern "C"
@ -44,7 +44,7 @@ extern "C"
namespace mapnik
{
class font_face : mapnik::noncopyable
class font_face : util::noncopyable
{
public:
font_face(FT_Face face);
@ -77,7 +77,7 @@ private:
using face_ptr = std::shared_ptr<font_face>;
class MAPNIK_DECL font_face_set : private mapnik::noncopyable
class MAPNIK_DECL font_face_set : private util::noncopyable
{
public:
using iterator = std::vector<face_ptr>::iterator;
@ -97,7 +97,7 @@ using face_set_ptr = std::unique_ptr<font_face_set>;
// FT_Stroker wrapper
class stroker : mapnik::noncopyable
class stroker : util::noncopyable
{
public:
explicit stroker(FT_Stroker s)

4
include/mapnik/text/font_library.hpp
View file

@ -25,7 +25,7 @@
// mapnik
#include <mapnik/config.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// stl
#include <memory>
@ -35,7 +35,7 @@ struct FT_MemoryRec_;
namespace mapnik {
class MAPNIK_DECL font_library : public noncopyable
class MAPNIK_DECL font_library : public util::noncopyable
{
public:
explicit font_library();

4
include/mapnik/text/formatting/registry.hpp
View file

@ -26,7 +26,7 @@
#include <mapnik/utils.hpp>
#include <mapnik/text/formatting/base.hpp>
#include <mapnik/text/text_properties.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// stl
#include <string>
@ -40,7 +40,7 @@ namespace formatting
using from_xml_function_ptr = node_ptr (*) (xml_node const&, fontset_map const&) ;
class registry : public singleton<registry, CreateStatic>,
private mapnik::noncopyable
private util::noncopyable
{
public:
registry();

4
include/mapnik/text/glyph_info.hpp
View file

@ -25,7 +25,7 @@
//mapnik
#include <mapnik/text/evaluated_format_properties_ptr.hpp>
#include <mapnik/pixel_position.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <memory>
#include <cmath>
@ -36,7 +36,7 @@ namespace mapnik
class font_face;
using face_ptr = std::shared_ptr<font_face>;
struct glyph_info : noncopyable
struct glyph_info : util::noncopyable
{
glyph_info(unsigned g_index,
unsigned c_index,

6
include/mapnik/text/itemizer.hpp
View file

@ -26,7 +26,7 @@
//mapnik
#include <mapnik/text/evaluated_format_properties_ptr.hpp>
#include <mapnik/value_types.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// stl
#include <string>
@ -41,7 +41,7 @@
namespace mapnik
{
struct text_item : noncopyable
struct text_item : util::noncopyable
{
text_item(unsigned s,
unsigned e,
@ -84,7 +84,7 @@ public:
std::pair<unsigned, unsigned> line(unsigned i) const;
unsigned num_lines() const;
private:
template<typename T> struct run : noncopyable
template<typename T> struct run : util::noncopyable
{
run(T const& data, unsigned start, unsigned end)
: start(start), end(end), data(data) {}

4
include/mapnik/text/placement_finder.hpp
View file

@ -29,7 +29,7 @@
#include <mapnik/text/placements/base.hpp>
#include <mapnik/text/glyph_positions.hpp>
#include <mapnik/text/rotation.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
namespace mapnik
{
@ -42,7 +42,7 @@ class vertex_cache;
class text_placement_info;
struct glyph_info;
class placement_finder : mapnik::noncopyable
class placement_finder : util::noncopyable
{
public:
placement_finder(feature_impl const& feature,

2
include/mapnik/text/placements/base.hpp
View file

@ -40,7 +40,7 @@ struct attribute;
// This placement has first to be tested by placement_finder to verify it
// can actually be used.
class MAPNIK_DECL text_placement_info : mapnik::noncopyable
class MAPNIK_DECL text_placement_info : util::noncopyable
{
public:
// Constructor. Takes the parent text_placements object as a parameter

4
include/mapnik/text/placements/registry.hpp
View file

@ -25,7 +25,7 @@
// mapnik
#include <mapnik/utils.hpp>
#include <mapnik/text/placements/base.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// stl
#include <string>
@ -39,7 +39,7 @@ namespace placements
using from_xml_function_ptr = text_placements_ptr (*) (xml_node const&, fontset_map const&, bool) ;
class registry : public singleton<registry, CreateStatic>,
private mapnik::noncopyable
private util::noncopyable
{
public:
registry();

4
include/mapnik/text/renderer.hpp
View file

@ -27,7 +27,7 @@
#include <mapnik/text/placement_finder.hpp>
#include <mapnik/image_compositing.hpp>
#include <mapnik/symbolizer_enumerations.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// agg
#include <agg_trans_affine.h>
@ -50,7 +50,7 @@ struct glyph_t
: image(image_), properties(properties_) {}
};
class text_renderer : private mapnik::noncopyable
class text_renderer : private util::noncopyable
{
public:
text_renderer (halo_rasterizer_e rasterizer,

4
include/mapnik/text/text_line.hpp
View file

@ -24,7 +24,7 @@
//stl
#include <vector>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
namespace mapnik
{
@ -35,7 +35,7 @@ struct glyph_info;
// It can be used for rendering but no text processing (like line breaking)
// should be done!
class text_line : noncopyable
class text_line : util::noncopyable
{
public:
using glyph_vector = std::vector<glyph_info>;

4
include/mapnik/text/text_properties.hpp
View file

@ -30,7 +30,7 @@
#include <mapnik/text/formatting/base.hpp>
#include <mapnik/symbolizer_base.hpp>
#include <mapnik/symbolizer_enumerations.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/text/font_feature_settings.hpp>
// stl
@ -63,7 +63,7 @@ struct evaluated_format_properties
font_feature_settings ff_settings;
};
struct evaluated_text_properties : noncopyable
struct evaluated_text_properties : util::noncopyable
{
label_placement_e label_placement;
double label_spacing;

4
include/mapnik/unicode.hpp
View file

@ -25,7 +25,7 @@
//mapnik
#include <mapnik/config.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/value_types.hpp>
// std
@ -36,7 +36,7 @@ struct UConverter;
namespace mapnik {
class MAPNIK_DECL transcoder : private mapnik::noncopyable
class MAPNIK_DECL transcoder : private util::noncopyable
{
public:
explicit transcoder (std::string const& encoding);

4
include/mapnik/util/file_io.hpp
View file

@ -26,7 +26,7 @@
// mapnik
#include <mapnik/utils.hpp>
#include <mapnik/make_unique.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
//#include <mapnik/config.hpp>
// stl
@ -36,7 +36,7 @@
namespace mapnik { namespace util {
class file : public noncopyable
class file : public util::noncopyable
{
public:
using file_ptr = std::unique_ptr<std::FILE, int (*)(std::FILE *)>;

10
include/mapnik/noncopyable.hpp → include/mapnik/util/noncopyable.hpp
View file

@ -20,10 +20,10 @@
*
*****************************************************************************/
#ifndef MAPNIK_NONCOPYABLE_HPP
#define MAPNIK_NONCOPYABLE_HPP
#ifndef MAPNIK_UTIL_NONCOPYABLE_HPP
#define MAPNIK_UTIL_NONCOPYABLE_HPP
namespace mapnik {
namespace mapnik { namespace util {
namespace non_copyable_
{
@ -40,6 +40,6 @@ protected:
using noncopyable = non_copyable_::noncopyable;
} // namespace mapnik
}}
#endif // MAPNIK_NONCOPYABLE_HPP
#endif // MAPNIK_UTIL_NONCOPYABLE_HPP

6
include/mapnik/vertex_cache.hpp
View file

@ -26,7 +26,7 @@
#include <mapnik/pixel_position.hpp>
#include <mapnik/debug.hpp>
#include <mapnik/config.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// agg
#include "agg_basics.h"
@ -43,7 +43,7 @@ class vertex_cache;
using vertex_cache_ptr = std::unique_ptr<vertex_cache>;
// Caches all path points and their lengths. Allows easy moving in both directions.
class MAPNIK_DECL vertex_cache : noncopyable
class MAPNIK_DECL vertex_cache : util::noncopyable
{
struct segment
{
@ -81,7 +81,7 @@ public:
pixel_position const& position() const { return current_position; }
};
class scoped_state : noncopyable
class scoped_state : util::noncopyable
{
public:
scoped_state(vertex_cache &pp) : pp_(pp), state_(pp.save_state()), restored_(false) {}

8
include/mapnik/vertex_converters.hpp
View file

@ -32,7 +32,7 @@
#include <mapnik/offset_converter.hpp>
#include <mapnik/simplify.hpp>
#include <mapnik/simplify_converter.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/value_types.hpp>
#include <mapnik/symbolizer_enumerations.hpp>
#include <mapnik/symbolizer_keys.hpp>
@ -319,7 +319,7 @@ struct converters_helper<Dispatcher>
};
template <typename Args, typename... ConverterTypes>
struct dispatcher : mapnik::noncopyable
struct dispatcher : util::noncopyable
{
using this_type = dispatcher;
using args_type = Args;
@ -337,7 +337,7 @@ struct dispatcher : mapnik::noncopyable
};
template <typename Processor>
struct arguments : mapnik::noncopyable
struct arguments : util::noncopyable
{
using processor_type = Processor;
arguments(Processor & proc, box2d<double> const& bbox, symbolizer_base const& sym, view_transform const& tr,
@ -367,7 +367,7 @@ struct arguments : mapnik::noncopyable
}
template <typename Processor, typename... ConverterTypes >
struct vertex_converter : private mapnik::noncopyable
struct vertex_converter : private util::noncopyable
{
using bbox_type = box2d<double>;
using processor_type = Processor;

4
include/mapnik/vertex_vector.hpp
View file

@ -29,7 +29,7 @@
// mapnik
#include <mapnik/vertex.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// stl
#include <algorithm>
@ -40,7 +40,7 @@ namespace mapnik
{
template <typename T>
class vertex_vector : private mapnik::noncopyable
class vertex_vector : private util::noncopyable
{
using coord_type = T;
enum block_e {

4
include/mapnik/wkb.hpp
View file

@ -26,7 +26,7 @@
// mapnik
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_container.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
namespace mapnik
{
@ -49,7 +49,7 @@ enum wkbFormat : std::uint8_t
wkbSpatiaLite=3
};
class MAPNIK_DECL geometry_utils : private mapnik::noncopyable
class MAPNIK_DECL geometry_utils : private util::noncopyable
{
public:

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

@ -34,7 +34,7 @@
class postgis_processor_context;
using postgis_processor_context_ptr = std::shared_ptr<postgis_processor_context>;
class AsyncResultSet : public IResultSet, private mapnik::noncopyable
class AsyncResultSet : public IResultSet, private mapnik::util::noncopyable
{
public:
AsyncResultSet(postgis_processor_context_ptr const& ctx,

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

@ -28,7 +28,7 @@
#include "connection.hpp"
#include "resultset.hpp"
class CursorResultSet : public IResultSet, private mapnik::noncopyable
class CursorResultSet : public IResultSet, private mapnik::util::noncopyable
{
public:
CursorResultSet(std::shared_ptr<Connection> const &conn, std::string cursorName, int fetch_count)

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

@ -45,7 +45,7 @@ public:
virtual const char* getValue(const char* name) const = 0;
};
class ResultSet : public IResultSet, private mapnik::noncopyable
class ResultSet : public IResultSet, private mapnik::util::noncopyable
{
public:
ResultSet(PGresult *res)

4
plugins/input/shape/dbfile.hpp
View file

@ -25,7 +25,7 @@
// mapnik
#include <mapnik/feature.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/unicode.hpp>
#ifdef SHAPE_MEMORY_MAPPED_FILE
#include <mapnik/mapped_memory_cache.hpp>
@ -52,7 +52,7 @@ struct field_descriptor
};
class dbf_file : private mapnik::noncopyable
class dbf_file : private mapnik::util::noncopyable
{
private:
int num_records_;

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

@ -26,7 +26,7 @@
// mapnik
#include <mapnik/geometry.hpp>
#include <mapnik/box2d.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// boost
#include <boost/optional.hpp>
@ -37,7 +37,7 @@
#include "dbfile.hpp"
#include "shapefile.hpp"
struct shape_io : mapnik::noncopyable
struct shape_io : mapnik::util::noncopyable
{
public:
enum shapeType

4
plugins/input/shape/shapefile.hpp
View file

@ -38,7 +38,7 @@
#include <mapnik/mapped_memory_cache.hpp>
#include <boost/interprocess/streams/bufferstream.hpp>
#endif
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
using mapnik::box2d;
using mapnik::read_int32_ndr;
@ -131,7 +131,7 @@ struct shape_record
}
};
class shape_file : mapnik::noncopyable
class shape_file : mapnik::util::noncopyable
{
public:

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

@ -28,7 +28,7 @@
#include <mapnik/datasource.hpp>
#include <mapnik/params.hpp>
#include <mapnik/box2d.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// boost
#include <memory>
@ -43,7 +43,7 @@ extern "C" {
#include <sqlite3.h>
}
class prepared_index_statement : mapnik::noncopyable
class prepared_index_statement : mapnik::util::noncopyable
{
public:

2
src/agg/process_line_pattern_symbolizer.cpp
View file

@ -31,7 +31,7 @@
#include <mapnik/marker_cache.hpp>
#include <mapnik/symbolizer.hpp>
#include <mapnik/vertex_converters.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/parse_path.hpp>
#include <mapnik/renderer_common/clipping_extent.hpp>
#include <mapnik/renderer_common/render_pattern.hpp>

6
src/cairo/process_markers_symbolizer.cpp
View file

@ -27,7 +27,7 @@
#include <mapnik/cairo/cairo_render_vector.hpp>
#include <mapnik/markers_placement.hpp>
#include <mapnik/svg/svg_path_adapter.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/pixel_position.hpp>
#include <mapnik/attribute.hpp>
#include <mapnik/marker.hpp>
@ -48,7 +48,7 @@ namespace svg { struct path_attributes; }
namespace detail {
template <typename RendererContext, typename SvgPath, typename Attributes, typename Detector>
struct markers_dispatch : mapnik::noncopyable
struct markers_dispatch : util::noncopyable
{
markers_dispatch(SvgPath & marker,
Attributes const& attributes,
@ -122,7 +122,7 @@ struct markers_dispatch : mapnik::noncopyable
};
template <typename RendererContext, typename Detector>
struct raster_markers_dispatch : mapnik::noncopyable
struct raster_markers_dispatch : util::noncopyable
{
raster_markers_dispatch(mapnik::image_data_rgba8 & src,
agg::trans_affine const& marker_trans,

6
src/expression_node.cpp
View file

@ -22,7 +22,7 @@
#include <mapnik/expression_node.hpp>
#include <mapnik/value_types.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#if defined(BOOST_REGEX_HAS_ICU)
#include <boost/regex/icu.hpp>
@ -33,7 +33,7 @@
namespace mapnik
{
struct _regex_match_impl : noncopyable {
struct _regex_match_impl : util::noncopyable {
#if defined(BOOST_REGEX_HAS_ICU)
_regex_match_impl(value_unicode_string const& ustr) :
pattern_(boost::make_u32regex(ustr)) {}
@ -45,7 +45,7 @@ struct _regex_match_impl : noncopyable {
#endif
};
struct _regex_replace_impl : noncopyable {
struct _regex_replace_impl : util::noncopyable {
#if defined(BOOST_REGEX_HAS_ICU)
_regex_replace_impl(value_unicode_string const& ustr, value_unicode_string const& f) :
pattern_(boost::make_u32regex(ustr)),

4
src/libxml2_loader.cpp
View file

@ -27,7 +27,7 @@
#include <mapnik/xml_node.hpp>
#include <mapnik/config_error.hpp>
#include <mapnik/util/trim.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/util/fs.hpp>
// libxml
@ -43,7 +43,7 @@
namespace mapnik
{
class libxml2_loader : mapnik::noncopyable
class libxml2_loader : util::noncopyable
{
public:
libxml2_loader(const char *encoding = nullptr, int options = DEFAULT_OPTIONS, const char *url = nullptr) :

4
src/load_map.cpp
View file

@ -50,7 +50,7 @@
#include <mapnik/util/conversions.hpp>
#include <mapnik/util/trim.hpp>
#include <mapnik/marker_cache.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/util/fs.hpp>
#include <mapnik/image_filter_types.hpp>
#include <mapnik/projection.hpp>
@ -84,7 +84,7 @@ constexpr unsigned name2int(const char *str, int off = 0)
return !str[off] ? 5381 : (name2int(str, off+1)*33) ^ str[off];
}
class map_parser : mapnik::noncopyable
class map_parser : util::noncopyable
{
public:
map_parser(Map & map, bool strict, std::string const& filename = "") :

4
src/rapidxml_loader.cpp
View file

@ -32,7 +32,7 @@
#include <boost/property_tree/detail/xml_parser_read_rapidxml.hpp>
#include <mapnik/xml_node.hpp>
#include <mapnik/util/trim.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
// stl
#include <iostream>
@ -42,7 +42,7 @@ namespace rapidxml = boost::property_tree::detail::rapidxml;
namespace mapnik
{
class rapidxml_loader : mapnik::noncopyable
class rapidxml_loader : util::noncopyable
{
public:
rapidxml_loader() :

2
src/text/text_layout.cpp
View file

@ -303,7 +303,7 @@ void text_layout::break_line_icu(std::pair<unsigned, unsigned> && line_limits)
}
}
struct line_breaker : mapnik::noncopyable
struct line_breaker : util::noncopyable
{
line_breaker(value_unicode_string const& ustr, char wrap_char)
: ustr_(ustr),

4
src/wkb.cpp
View file

@ -28,14 +28,14 @@
#include <mapnik/coord_array.hpp>
#include <mapnik/geom_util.hpp>
#include <mapnik/feature.hpp>
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
namespace mapnik
{
using CoordinateArray = coord_array<coord2d>;
struct wkb_reader : mapnik::noncopyable
struct wkb_reader : util::noncopyable
{
private:
enum wkbByteOrder {

6
utils/pgsql2sqlite/sqlite.hpp
View file

@ -20,7 +20,7 @@
*
*****************************************************************************/
#include <mapnik/noncopyable.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/util/variant.hpp>
// boost
#include <memory>
@ -38,7 +38,7 @@
namespace mapnik { namespace sqlite {
class database : private mapnik::noncopyable
class database : private util::noncopyable
{
friend class prepared_statement;
@ -75,7 +75,7 @@ namespace mapnik { namespace sqlite {
using value_type = mapnik::util::variant<int,double,std::string, blob,null_type>;
using record_type = std::vector<value_type>;
class prepared_statement : mapnik::noncopyable
class prepared_statement : util::noncopyable
{
struct binder
{