From 6070c9caf0cd5fc335f70e66ade2268f9abe6834 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Wed, 30 Jul 2014 16:25:21 -0700
Subject: [PATCH] fix compile

---
 include/mapnik/symbolizer.hpp            | 2 +-
 include/mapnik/symbolizer_utils.hpp      | 2 +-
 include/mapnik/util/dasharray_parser.hpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/mapnik/symbolizer.hpp b/include/mapnik/symbolizer.hpp
index 39dda6205..2a03ad839 100644
--- a/include/mapnik/symbolizer.hpp
+++ b/include/mapnik/symbolizer.hpp
@@ -381,7 +381,7 @@ struct evaluate_expression_wrapper<mapnik::dash_array>
         std::string str = val.to_string();
         if (util::parse_dasharray(str.begin(),str.end(),buf))
         {
-            add_dashes(buf,dash);
+            util::add_dashes(buf,dash);
         }
         return dash;
     }
diff --git a/include/mapnik/symbolizer_utils.hpp b/include/mapnik/symbolizer_utils.hpp
index 00410eaf4..d92375da2 100644
--- a/include/mapnik/symbolizer_utils.hpp
+++ b/include/mapnik/symbolizer_utils.hpp
@@ -403,7 +403,7 @@ struct set_symbolizer_property_impl<Symbolizer,dash_array,false>
         {
             std::vector<double> buf;
             dash_array dash;
-            if (util::parse_dasharray((*str).begin(),(*str).end(),buf) && add_dashes(buf,dash))
+            if (util::parse_dasharray((*str).begin(),(*str).end(),buf) && util::add_dashes(buf,dash))
             {
                 put(sym,key,dash);
             }
diff --git a/include/mapnik/util/dasharray_parser.hpp b/include/mapnik/util/dasharray_parser.hpp
index 06dd8fe52..0cf0081dc 100644
--- a/include/mapnik/util/dasharray_parser.hpp
+++ b/include/mapnik/util/dasharray_parser.hpp
@@ -60,7 +60,7 @@ bool parse_dasharray(Iterator first, Iterator last, std::vector<double>& dasharr
     return r;
 }
 
-inline bool add_dashes(std::vector<double> & buf, dash_array & dash)
+inline bool add_dashes(std::vector<double> & buf, std::vector<std::pair<double,double> > & dash)
 {
     if (buf.empty()) return false;
     size_t size = buf.size();