diff options
Diffstat (limited to 'generator/feature_builder.cpp')
| -rw-r--r-- | generator/feature_builder.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/generator/feature_builder.cpp b/generator/feature_builder.cpp index ba38702358..4e859a920c 100644 --- a/generator/feature_builder.cpp +++ b/generator/feature_builder.cpp @@ -19,8 +19,8 @@ #include "base/logging.hpp" #include "base/string_utils.hpp" -#include "std/cstring.hpp" -#include "std/algorithm.hpp" +#include <algorithm> +#include <cstring> using namespace feature; @@ -79,14 +79,14 @@ void FeatureBuilder1::SetRank(uint8_t rank) m_params.rank = rank; } -void FeatureBuilder1::AddHouseNumber(string const & houseNumber) +void FeatureBuilder1::AddHouseNumber(std::string const & houseNumber) { m_params.AddHouseNumber(houseNumber); } -void FeatureBuilder1::AddStreet(string const & streetName) { m_params.AddStreet(streetName); } +void FeatureBuilder1::AddStreet(std::string const & streetName) { m_params.AddStreet(streetName); } -void FeatureBuilder1::AddPostcode(string const & postcode) +void FeatureBuilder1::AddPostcode(std::string const & postcode) { m_params.GetMetadata().Set(Metadata::FMD_POSTCODE, postcode); } @@ -106,7 +106,7 @@ void FeatureBuilder1::SetLinear(bool reverseGeometry) { auto & cont = m_polygons.front(); ASSERT(!cont.empty(), ()); - reverse(cont.begin(), cont.end()); + std::reverse(cont.begin(), cont.end()); } } @@ -169,7 +169,7 @@ bool FeatureBuilder1::RemoveInvalidTypes() m_params.IsEmptyNames()); } -bool FeatureBuilder1::FormatFullAddress(string & res) const +bool FeatureBuilder1::FormatFullAddress(std::string & res) const { return m_params.FormatFullAddress(m_limitRect.Center(), res); } @@ -491,7 +491,7 @@ bool FeatureBuilder1::HasOsmId(osm::Id const & id) const return false; } -string FeatureBuilder1::GetOsmIdsString() const +std::string FeatureBuilder1::GetOsmIdsString() const { if (m_osmIds.empty()) return "(NOT AN OSM FEATURE)"; @@ -510,14 +510,14 @@ int FeatureBuilder1::GetMinFeatureDrawScale() const return (minScale == -1 ? 1000 : minScale); } -bool FeatureBuilder1::AddName(string const & lang, string const & name) +bool FeatureBuilder1::AddName(std::string const & lang, std::string const & name) { return m_params.AddName(lang, name); } -string FeatureBuilder1::GetName(int8_t lang) const +std::string FeatureBuilder1::GetName(int8_t lang) const { - string s; + std::string s; VERIFY(m_params.name.GetString(lang, s) != s.empty(), ()); return s; } @@ -530,7 +530,7 @@ size_t FeatureBuilder1::GetPointsCount() const return counter; } -string DebugPrint(FeatureBuilder1 const & f) +std::string DebugPrint(FeatureBuilder1 const & f) { ostringstream out; @@ -569,7 +569,7 @@ uint64_t FeatureBuilder1::GetWayIDForRouting() const return 0; } -string DebugPrint(FeatureBuilder2 const & f) +std::string DebugPrint(FeatureBuilder2 const & f) { return DebugPrint(static_cast<FeatureBuilder1 const &>(f)); } @@ -654,7 +654,7 @@ void FeatureBuilder2::Serialize(SupportingData & data, serial::CodingParams cons serial::SavePoint(sink, GetOuterGeometry()[0], params); // offsets was pushed from high scale index to low - reverse(data.m_ptsOffset.begin(), data.m_ptsOffset.end()); + std::reverse(data.m_ptsOffset.begin(), data.m_ptsOffset.end()); serial::WriteVarUintArray(data.m_ptsOffset, sink); } } @@ -665,7 +665,7 @@ void FeatureBuilder2::Serialize(SupportingData & data, serial::CodingParams cons else { // offsets was pushed from high scale index to low - reverse(data.m_trgOffset.begin(), data.m_trgOffset.end()); + std::reverse(data.m_trgOffset.begin(), data.m_trgOffset.end()); serial::WriteVarUintArray(data.m_trgOffset, sink); } } |