From 96414f9262df58d4e3a4ca405fac1421b8d0abf4 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Fri, 12 Apr 2013 19:27:37 -0700
Subject: [PATCH] avoid std::vector declare within mapnik namespace

---
 include/mapnik/stroke.hpp | 4 +---
 src/load_map.cpp          | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/mapnik/stroke.hpp b/include/mapnik/stroke.hpp
index 2053d256f..edf52775d 100644
--- a/include/mapnik/stroke.hpp
+++ b/include/mapnik/stroke.hpp
@@ -33,9 +33,7 @@
 
 namespace mapnik
 {
-using std::pair;
-using std::vector;
-typedef vector<pair<double,double> > dash_array;
+typedef std::vector<std::pair<double,double> > dash_array;
 
 // if you add new tokens, don't forget to add them to the corresponding
 // string array in the cpp file.
diff --git a/src/load_map.cpp b/src/load_map.cpp
index 883b6458a..788f4f7ca 100644
--- a/src/load_map.cpp
+++ b/src/load_map.cpp
@@ -514,7 +514,7 @@ void map_parser::parse_fontset(Map & map, xml_node const& fset)
 
         // XXX Hack because map object isn't accessible by text_symbolizer
         // when it's parsed
-        fontsets_.insert(pair<std::string, font_set>(name, fontset));
+        fontsets_.insert(std::pair<std::string, font_set>(name, fontset));
     }
     catch (const config_error & ex)
     {