diff options
author | tatiana-kondakova <tatiana.kondakova@gmail.com> | 2017-07-31 11:26:22 +0300 |
---|---|---|
committer | Добрый Ээх <dobriy-eeh@users.noreply.github.com> | 2017-07-31 20:26:34 +0300 |
commit | ef2b582807ecbb2dca8fbad98e3fed61e5f3d7af (patch) | |
tree | 8230cfa3db1b4410677fc3af14d4581ddf2f6ee6 /routing_common | |
parent | 8820c2717909c41219875c86647d60cdcbb2e374 (diff) |
Remove using from hppbeta-940
Diffstat (limited to 'routing_common')
-rw-r--r-- | routing_common/bicycle_model.hpp | 1 | ||||
-rw-r--r-- | routing_common/car_model.hpp | 1 | ||||
-rw-r--r-- | routing_common/pedestrian_model.hpp | 1 | ||||
-rw-r--r-- | routing_common/vehicle_model.hpp | 21 |
4 files changed, 13 insertions, 11 deletions
diff --git a/routing_common/bicycle_model.hpp b/routing_common/bicycle_model.hpp index d96dad687e..8c26d0a2a0 100644 --- a/routing_common/bicycle_model.hpp +++ b/routing_common/bicycle_model.hpp @@ -3,6 +3,7 @@ #include "routing_common/vehicle_model.hpp" #include "std/shared_ptr.hpp" +#include "std/string.hpp" #include "std/unordered_map.hpp" namespace routing diff --git a/routing_common/car_model.hpp b/routing_common/car_model.hpp index 2281691ac3..1f99d97b67 100644 --- a/routing_common/car_model.hpp +++ b/routing_common/car_model.hpp @@ -3,6 +3,7 @@ #include "routing_common/vehicle_model.hpp" #include "std/shared_ptr.hpp" +#include "std/string.hpp" namespace routing { diff --git a/routing_common/pedestrian_model.hpp b/routing_common/pedestrian_model.hpp index 8637f9b41c..6c1e271cfd 100644 --- a/routing_common/pedestrian_model.hpp +++ b/routing_common/pedestrian_model.hpp @@ -3,6 +3,7 @@ #include "routing_common/vehicle_model.hpp" #include "std/shared_ptr.hpp" +#include "std/string.hpp" #include "std/unordered_map.hpp" namespace routing diff --git a/routing_common/vehicle_model.hpp b/routing_common/vehicle_model.hpp index 8e7b4f3623..04b30db243 100644 --- a/routing_common/vehicle_model.hpp +++ b/routing_common/vehicle_model.hpp @@ -6,8 +6,6 @@ #include <unordered_map> #include <vector> -using namespace std; - class Classificator; class FeatureType; @@ -50,10 +48,11 @@ public: virtual ~VehicleModelFactory() {} /// @return Default vehicle model which corresponds for all countrines, /// but it may be non optimal for some countries - virtual shared_ptr<IVehicleModel> GetVehicleModel() const = 0; + virtual std::shared_ptr<IVehicleModel> GetVehicleModel() const = 0; /// @return The most optimal vehicle model for specified country - virtual shared_ptr<IVehicleModel> GetVehicleModelForCountry(string const & country) const = 0; + virtual std::shared_ptr<IVehicleModel> GetVehicleModelForCountry( + std::string const & country) const = 0; }; class VehicleModel : public IVehicleModel @@ -66,7 +65,7 @@ public: bool m_isTransitAllowed; /// transit allowed for this road type }; - typedef initializer_list<FeatureTypeLimits> InitListT; + typedef std::initializer_list<FeatureTypeLimits> InitListT; VehicleModel(Classificator const & c, InitListT const & featureTypeLimits); @@ -95,7 +94,7 @@ public: protected: struct AdditionalRoadTags final { - initializer_list<char const *> m_hwtag; + std::initializer_list<char const *> m_hwtag; double m_speedKMpH; }; @@ -104,7 +103,7 @@ protected: /// Used in derived class constructors only. Not for public use. void SetAdditionalRoadTypes(Classificator const & c, - vector<AdditionalRoadTags> const & additionalTags); + std::vector<AdditionalRoadTags> const & additionalTags); /// \returns true if |types| is a oneway feature. /// \note According to OSM, tag "oneway" could have value "-1". That means it's a oneway feature @@ -143,13 +142,13 @@ private: bool const m_isTransitAllowed; }; - vector<AdditionalRoadType>::const_iterator FindRoadType(uint32_t type) const; + std::vector<AdditionalRoadType>::const_iterator FindRoadType(uint32_t type) const; - unordered_map<uint32_t, RoadLimits> m_types; + std::unordered_map<uint32_t, RoadLimits> m_types; - vector<AdditionalRoadType> m_addRoadTypes; + std::vector<AdditionalRoadType> m_addRoadTypes; uint32_t m_onewayType; }; -string DebugPrint(IVehicleModel::RoadAvailability const l); +std::string DebugPrint(IVehicleModel::RoadAvailability const l); } // namespace routing |