From 439fc9f700364c77fa0b58c93ebcc2427a21ef59 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Mon, 5 May 2014 10:44:59 -0700
Subject: [PATCH] fix variable shadowing in placements_list.hpp

---
 include/mapnik/text/placements_list.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/mapnik/text/placements_list.hpp b/include/mapnik/text/placements_list.hpp
index 4f436c682..0b5e356fb 100644
--- a/include/mapnik/text/placements_list.hpp
+++ b/include/mapnik/text/placements_list.hpp
@@ -42,8 +42,8 @@ struct glyph_info;
 
 struct glyph_position
 {
-    glyph_position(glyph_info const& glyph, pixel_position const& pos, rotation const& rot)
-        : glyph(&glyph), pos(pos), rot(rot) { }
+    glyph_position(glyph_info const& _glyph, pixel_position const& _pos, rotation const& _rot)
+        : glyph(&_glyph), pos(_pos), rot(_rot) { }
     glyph_info const* glyph;
     pixel_position pos;
     rotation rot;
@@ -52,8 +52,8 @@ struct glyph_position
 struct marker_info
 {
     marker_info() : marker(), transform() {}
-    marker_info(marker_ptr marker, agg::trans_affine const& transform) :
-        marker(marker), transform(transform) {}
+    marker_info(marker_ptr _marker, agg::trans_affine const& _transform) :
+        marker(_marker), transform(_transform) {}
     marker_ptr marker;
     agg::trans_affine transform;
 };