From 3a7c8ff3fb77649c8ec7c33a5055c1951bf540b0 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Tue, 7 Oct 2014 22:57:11 -0700 Subject: [PATCH] make scoped_state noncopyable --- include/mapnik/text/vertex_cache.hpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/include/mapnik/text/vertex_cache.hpp b/include/mapnik/text/vertex_cache.hpp index 1214d2577..eb69337b0 100644 --- a/include/mapnik/text/vertex_cache.hpp +++ b/include/mapnik/text/vertex_cache.hpp @@ -81,7 +81,7 @@ public: pixel_position const& position() const { return current_position; } }; - class scoped_state + class scoped_state : noncopyable { public: scoped_state(vertex_cache &pp) : pp_(pp), state_(pp.save_state()), restored_(false) {} @@ -90,7 +90,7 @@ public: state const& get_state() const { return state_; } private: vertex_cache &pp_; - class state state_; + state state_; bool restored_; }; @@ -224,8 +224,5 @@ vertex_cache::vertex_cache(T & path) } } - - - } #endif