From adfa73f64ac14ad9a832fb6616acee53661df827 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 7 Mar 2012 08:54:04 -0800 Subject: [PATCH] avoid combining default arg with const& --- src/load_map.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/load_map.cpp b/src/load_map.cpp index eea4353a8..3cfd51fb0 100644 --- a/src/load_map.cpp +++ b/src/load_map.cpp @@ -94,7 +94,7 @@ public: expr_grammar_(tr_) {} - void parse_map(Map & map, ptree const & sty, std::string const& base_path=""); + void parse_map(Map & map, ptree const & sty, std::string const& base_path); private: void parse_map_include( Map & map, ptree const & include); void parse_style(Map & map, ptree const & sty); @@ -181,7 +181,8 @@ void load_map(Map & map, std::string const& filename, bool strict) } #endif map_parser parser( strict, filename); - parser.parse_map(map, pt); + std::string base_path(""); + parser.parse_map(map, pt, base_path); } void load_map_string(Map & map, std::string const& str, bool strict, std::string base_path)