avoid combining default arg with const&
This commit is contained in:
parent
1c6da3893e
commit
adfa73f64a
1 changed files with 3 additions and 2 deletions
|
@ -94,7 +94,7 @@ public:
|
||||||
expr_grammar_(tr_)
|
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:
|
private:
|
||||||
void parse_map_include( Map & map, ptree const & include);
|
void parse_map_include( Map & map, ptree const & include);
|
||||||
void parse_style(Map & map, ptree const & sty);
|
void parse_style(Map & map, ptree const & sty);
|
||||||
|
@ -181,7 +181,8 @@ void load_map(Map & map, std::string const& filename, bool strict)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
map_parser parser( strict, filename);
|
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)
|
void load_map_string(Map & map, std::string const& str, bool strict, std::string base_path)
|
||||||
|
|
Loading…
Reference in a new issue