Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'generator/srtm_parser.hpp')
-rw-r--r--generator/srtm_parser.hpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/generator/srtm_parser.hpp b/generator/srtm_parser.hpp
index e0e6096e45..75785cfd6c 100644
--- a/generator/srtm_parser.hpp
+++ b/generator/srtm_parser.hpp
@@ -6,9 +6,9 @@
#include "base/macros.hpp"
-#include "std/cstdint.hpp"
-#include "std/string.hpp"
-#include "std/unordered_map.hpp"
+#include <cstdint>
+#include <string>
+#include <unordered_map>
namespace generator
{
@@ -18,13 +18,13 @@ public:
SrtmTile();
SrtmTile(SrtmTile && rhs);
- void Init(string const & dir, ms::LatLon const & coord);
+ void Init(std::string const & dir, ms::LatLon const & coord);
inline bool IsValid() const { return m_valid; }
// Returns height in meters at |coord| or kInvalidAltitude.
feature::TAltitude GetHeight(ms::LatLon const & coord);
- static string GetBase(ms::LatLon coord);
+ static std::string GetBase(ms::LatLon coord);
private:
inline feature::TAltitude const * Data() const
@@ -35,7 +35,7 @@ private:
inline size_t Size() const { return m_data.size() / sizeof(feature::TAltitude); }
void Invalidate();
- string m_data;
+ std::string m_data;
bool m_valid;
DISALLOW_COPY(SrtmTile);
@@ -44,13 +44,13 @@ private:
class SrtmTileManager
{
public:
- SrtmTileManager(string const & dir);
+ SrtmTileManager(std::string const & dir);
feature::TAltitude GetHeight(ms::LatLon const & coord);
private:
- string m_dir;
- unordered_map<string, SrtmTile> m_tiles;
+ std::string m_dir;
+ std::unordered_map<std::string, SrtmTile> m_tiles;
DISALLOW_COPY(SrtmTileManager);
};