boost::noncopyable -> mapnik::noncopyable
This commit is contained in:
parent
1d5ebcb64e
commit
5f46e45fc9
3 changed files with 5 additions and 7 deletions
|
@ -29,11 +29,9 @@
|
|||
#include <mapnik/text/placements/base.hpp>
|
||||
#include <mapnik/text/placements_list.hpp>
|
||||
#include <mapnik/text/rotation.hpp>
|
||||
|
||||
//stl
|
||||
#include <mapnik/noncopyable.hpp>
|
||||
|
||||
//boost
|
||||
#include <boost/utility.hpp>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
|
||||
namespace mapnik
|
||||
|
@ -46,7 +44,7 @@ class feature_impl;
|
|||
typedef feature_impl Feature;
|
||||
class vertex_cache;
|
||||
|
||||
class placement_finder : boost::noncopyable
|
||||
class placement_finder : mapnik::noncopyable
|
||||
{
|
||||
public:
|
||||
placement_finder(Feature const& feature,
|
||||
|
|
|
@ -27,11 +27,11 @@
|
|||
#include <mapnik/text/placement_finder.hpp>
|
||||
#include <mapnik/image_compositing.hpp>
|
||||
#include <mapnik/text_symbolizer.hpp>
|
||||
#include <mapnik/noncopyable.hpp>
|
||||
//TODO: Find a better place for halo_rasterizer_e!
|
||||
//TODO: Halo rasterizer selection should go to text_properties because it might make sense to use a different rasterizer for different fonts
|
||||
|
||||
//boost
|
||||
#include <boost/utility.hpp>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
|
||||
struct FT_Bitmap_;
|
||||
|
@ -41,7 +41,7 @@ namespace mapnik
|
|||
|
||||
struct glyph_t;
|
||||
|
||||
class text_renderer : private boost::noncopyable
|
||||
class text_renderer : private mapnik::noncopyable
|
||||
{
|
||||
public:
|
||||
text_renderer (halo_rasterizer_e rasterizer, composite_mode_e comp_op = src_over, double scale_factor=1.0, stroker_ptr stroker=stroker_ptr());
|
||||
|
|
|
@ -42,7 +42,7 @@ extern "C"
|
|||
namespace mapnik
|
||||
{
|
||||
|
||||
struct glyph_t : boost::noncopyable
|
||||
struct glyph_t : mapnik::noncopyable
|
||||
{
|
||||
FT_Glyph image;
|
||||
char_properties_ptr properties;
|
||||
|
|
Loading…
Add table
Reference in a new issue