gistfile1.txt

Index: src/load_map.cpp
===================================================================
--- src/load_map.cpp	(revision 2976)
+++ src/load_map.cpp	(working copy)
@@ -83,7 +83,7 @@
         relative_to_xml_(true),
         font_manager_(font_engine_) {}
 
-    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);
@@ -143,7 +143,8 @@
     }
 #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 const& base_path)
@@ -215,9 +216,9 @@
                 boost::filesystem::path xml_path(filename_);
                 // TODO - should we make this absolute?
                 #if (BOOST_FILESYSTEM_VERSION == 3)
-                    std::string const& base = xml_path.parent_path().string();
+                    std::string base = xml_path.parent_path().string();
                 #else // v2
-                    std::string const& base = xml_path.branch_path().string();
+                    std::string base = xml_path.branch_path().string();
                 #endif
 
                 map.set_base_path( base );