kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Use STL headers instead of std/...

Browse source
This commit is contained in:
tatiana-kondakova 2017-07-25 15:32:25 +03:00 • committed by Добрый Ээх
parent 7f90c748bb
commit 08253d796e
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
routing_common/vehicle_model.cpp
View file

@ -6,10 +6,6 @@
#include "base/macros.hpp"
#include "std/algorithm.hpp"
#include "std/initializer_list.hpp"
#include "std/limits.hpp"
namespace routing
{
VehicleModel::AdditionalRoadType::AdditionalRoadType(Classificator const & c,
@ -31,8 +27,8 @@ VehicleModel::VehicleModel(Classificator const & c, InitListT const & featureTyp
for (auto const & v : featureTypeLimits)
{
m_maxSpeedKMpH = max(m_maxSpeedKMpH, v.m_speedKMpH);
m_types.emplace(make_pair(c.GetTypeByPath(vector<string>(v.m_types, v.m_types + 2)),
RoadLimits(v.m_speedKMpH, v.m_isTransitAllowed)));
m_types.emplace(c.GetTypeByPath(vector<string>(v.m_types, v.m_types + 2)),
RoadLimits(v.m_speedKMpH, v.m_isTransitAllowed));
}
}

18
routing_common/vehicle_model.hpp
View file

@ -1,12 +1,16 @@
#pragma once
#include "std/cstdint.hpp"
#include "std/initializer_list.hpp"
#include "std/shared_ptr.hpp"
#include "std/string.hpp"
#include "std/unordered_map.hpp"
#include "std/utility.hpp"
#include "std/vector.hpp"
#include <initializer_list>
#include <memory>
#include <string>
#include <unordered_map>
#include <vector>
using std::initializer_list;
using std::shared_ptr;
using std::string;
using std::unordered_map;
using std::vector;
class Classificator;
class FeatureType;