diff options
Diffstat (limited to 'generator/booking_dataset.cpp')
| -rw-r--r-- | generator/booking_dataset.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/generator/booking_dataset.cpp b/generator/booking_dataset.cpp index 5abc35dad7..30b088c221 100644 --- a/generator/booking_dataset.cpp +++ b/generator/booking_dataset.cpp @@ -8,16 +8,16 @@ #include "base/string_utils.hpp" -#include "std/iomanip.hpp" +#include <iomanip> #include "boost/algorithm/string/replace.hpp" namespace generator { // BookingHotel ------------------------------------------------------------------------------------ -BookingHotel::BookingHotel(string const & src) +BookingHotel::BookingHotel(std::string const & src) { - vector<string> rec; + std::vector<std::string> rec; strings::ParseCSVRow(src, '\t', rec); CHECK_EQUAL(rec.size(), FieldsCount(), ("Error parsing hotels.tsv line:", boost::replace_all_copy(src, "\t", "\\t"))); @@ -44,7 +44,7 @@ BookingHotel::BookingHotel(string const & src) ostream & operator<<(ostream & s, BookingHotel const & h) { - s << fixed << setprecision(7); + s << std::fixed << std::setprecision(7); s << "Id: " << h.m_id << "\t Name: " << h.m_name << "\t Address: " << h.m_address << "\t lat: " << h.m_latLon.lat << " lon: " << h.m_latLon.lon; return s; @@ -62,7 +62,7 @@ bool BookingDataset::NecessaryMatchingConditionHolds(FeatureBuilder1 const & fb) template <> void BookingDataset::PreprocessMatchedOsmObject(ObjectId, FeatureBuilder1 & fb, - function<void(FeatureBuilder1 &)> const fn) const + std::function<void(FeatureBuilder1 &)> const fn) const { // Turn a hotel into a simple building. if (fb.GetGeomType() == feature::GEOM_AREA) @@ -89,7 +89,7 @@ void BookingDataset::PreprocessMatchedOsmObject(ObjectId, FeatureBuilder1 & fb, template <> void BookingDataset::BuildObject(Object const & hotel, - function<void(FeatureBuilder1 &)> const & fn) const + std::function<void(FeatureBuilder1 &)> const & fn) const { FeatureBuilder1 fb; FeatureParams params; @@ -117,7 +117,7 @@ void BookingDataset::BuildObject(Object const & hotel, if (!hotel.m_translations.empty()) { // TODO(mgsergio): Move parsing to the hotel costruction stage. - vector<string> parts; + std::vector<std::string> parts; strings::ParseCSVRow(hotel.m_translations, '|', parts); CHECK_EQUAL(parts.size() % 3, 0, ("Invalid translation string:", hotel.m_translations)); for (size_t i = 0; i < parts.size(); i += 3) |