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/restriction_collector.hpp')
-rw-r--r--generator/restriction_collector.hpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/generator/restriction_collector.hpp b/generator/restriction_collector.hpp
index 3e66f60427..79dfe963ac 100644
--- a/generator/restriction_collector.hpp
+++ b/generator/restriction_collector.hpp
@@ -4,12 +4,12 @@
#include "routing/restrictions_serialization.hpp"
-#include "std/functional.hpp"
-#include "std/limits.hpp"
-#include "std/map.hpp"
-#include "std/string.hpp"
-#include "std/utility.hpp"
-#include "std/vector.hpp"
+#include <functional>
+#include <limits>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
namespace routing
{
@@ -21,7 +21,7 @@ public:
RestrictionCollector() = default;
/// \param restrictionPath full path to file with road restrictions in osm id terms.
/// \param osmIdsToFeatureIdsPath full path to file with mapping from osm ids to feature ids.
- RestrictionCollector(string const & restrictionPath, string const & osmIdsToFeatureIdsPath);
+ RestrictionCollector(std::string const & restrictionPath, std::string const & osmIdsToFeatureIdsPath);
bool HasRestrictions() const { return !m_restrictions.empty(); }
@@ -45,7 +45,7 @@ private:
/// No, 157616940, 157616940,
/// No, 157616940, 157617107,
/// \param path path to the text file with restrictions.
- bool ParseRestrictions(string const & path);
+ bool ParseRestrictions(std::string const & path);
/// \brief Adds feature id and corresponding |osmId| to |m_osmIdToFeatureId|.
void AddFeatureId(uint32_t featureId, osm::Id osmId);
@@ -56,11 +56,11 @@ private:
/// \note This method should be called to add a restriction when feature ids of the restriction
/// are unknown. The feature ids should be set later with a call of |SetFeatureId(...)| method.
/// \returns true if restriction is add and false otherwise.
- bool AddRestriction(Restriction::Type type, vector<osm::Id> const & osmIds);
+ bool AddRestriction(Restriction::Type type, std::vector<osm::Id> const & osmIds);
RestrictionVec m_restrictions;
- map<osm::Id, uint32_t> m_osmIdToFeatureId;
+ std::map<osm::Id, uint32_t> m_osmIdToFeatureId;
};
-bool FromString(string str, Restriction::Type & type);
+bool FromString(std::string str, Restriction::Type & type);
} // namespace routing