diff options
Diffstat (limited to 'generator/borders_loader.hpp')
| -rw-r--r-- | generator/borders_loader.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generator/borders_loader.hpp b/generator/borders_loader.hpp index 7d9a56dd73..e2f9b11e33 100644 --- a/generator/borders_loader.hpp +++ b/generator/borders_loader.hpp @@ -3,7 +3,7 @@ #include "geometry/region2d.hpp" #include "geometry/tree4d.hpp" -#include "std/string.hpp" +#include <string> #define BORDERS_DIR "borders/" #define BORDERS_EXTENSION ".poly" @@ -15,7 +15,7 @@ namespace borders struct CountryPolygons { - CountryPolygons(string const & name = "") : m_name(name), m_index(-1) {} + CountryPolygons(std::string const & name = "") : m_name(name), m_index(-1) {} bool IsEmpty() const { return m_regions.IsEmpty(); } void Clear() @@ -26,14 +26,14 @@ namespace borders } RegionsContainerT m_regions; - string m_name; + std::string m_name; mutable int m_index; }; typedef m4::Tree<CountryPolygons> CountriesContainerT; - bool LoadCountriesList(string const & baseDir, CountriesContainerT & countries); + bool LoadCountriesList(std::string const & baseDir, CountriesContainerT & countries); - void GeneratePackedBorders(string const & baseDir); - void UnpackBorders(string const & baseDir, string const & targetDir); + void GeneratePackedBorders(std::string const & baseDir); + void UnpackBorders(std::string const & baseDir, std::string const & targetDir); } |