sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avoid std::vector declare within mapnik namespace

Browse source
This commit is contained in:
Dane Springmeyer 2013-04-12 19:27:37 -07:00
parent c6fd387469
commit 96414f9262
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mapnik/stroke.hpp
View file

@ -33,9 +33,7 @@
namespace mapnik namespace mapnik
{ {
using std::pair; typedef std::vector<std::pair<double,double> > dash_array;
using std::vector;
typedef vector<pair<double,double> > dash_array;
// if you add new tokens, don't forget to add them to the corresponding // if you add new tokens, don't forget to add them to the corresponding
// string array in the cpp file. // string array in the cpp file.

2
src/load_map.cpp
View file

@ -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 // XXX Hack because map object isn't accessible by text_symbolizer
// when it's parsed // 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) catch (const config_error & ex)
{ {