From c3ea59c3c80f2bc714bb246b2a56f8ea43fbc4f1 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Wed, 3 Feb 2010 18:36:01 +0000
Subject: [PATCH] don't pass expression_ptr as const

---
 bindings/python/mapnik_text_symbolizer.cpp | 3 +--
 include/mapnik/text_symbolizer.hpp         | 8 ++------
 src/text_symbolizer.cpp                    | 4 ++--
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/bindings/python/mapnik_text_symbolizer.cpp b/bindings/python/mapnik_text_symbolizer.cpp
index c3ec8afa0..aa1559547 100644
--- a/bindings/python/mapnik_text_symbolizer.cpp
+++ b/bindings/python/mapnik_text_symbolizer.cpp
@@ -252,8 +252,7 @@ class_<text_symbolizer>("TextSymbolizer",init<expression_ptr,std::string const&,
     .add_property("minimum_distance",
                   &text_symbolizer::get_minimum_distance,
                   &text_symbolizer::set_minimum_distance)
-    .add_property("name",make_function
-                 (&text_symbolizer::get_name,return_value_policy<copy_const_reference>()),
+    .add_property("name",&text_symbolizer::get_name,
                  &text_symbolizer::set_name)
     .add_property("opacity",
                   &text_symbolizer::get_opacity,
diff --git a/include/mapnik/text_symbolizer.hpp b/include/mapnik/text_symbolizer.hpp
index 47ea441f0..2d7fd132c 100644
--- a/include/mapnik/text_symbolizer.hpp
+++ b/include/mapnik/text_symbolizer.hpp
@@ -98,12 +98,8 @@ namespace mapnik
          text_symbolizer(expression_ptr name, unsigned size, color const& fill);
          text_symbolizer(text_symbolizer const& rhs);
          text_symbolizer& operator=(text_symbolizer const& rhs);
-         
-         //
-	 expression_ptr const& get_name() const;
-	 void set_name(const expression_ptr& expr);
-	 //
-	 
+         expression_ptr get_name() const;
+         void set_name(expression_ptr expr);
          unsigned get_text_ratio() const; // target ratio for text bounding box in pixels
          void set_text_ratio(unsigned ratio);
          unsigned get_wrap_width() const; // width to wrap text at, or trigger ratio
diff --git a/src/text_symbolizer.cpp b/src/text_symbolizer.cpp
index ce1fe2a6e..6815305d7 100644
--- a/src/text_symbolizer.cpp
+++ b/src/text_symbolizer.cpp
@@ -205,12 +205,12 @@ text_symbolizer& text_symbolizer::operator=(text_symbolizer const& other)
     return *this;
 }
 
-expression_ptr const& text_symbolizer::get_name() const
+expression_ptr text_symbolizer::get_name() const
 {
     return name_;
 }
 
-void text_symbolizer::set_name(const expression_ptr& name)
+void text_symbolizer::set_name(expression_ptr name)
 {
     name_ = name;
 }