From 3e173df0b3af2f5cb94096ee35343c9bf6093925 Mon Sep 17 00:00:00 2001 From: Lev Dragunov Date: Mon, 14 Mar 2016 13:32:12 +0300 Subject: [PATCH] Linux build fix. --- map/framework.cpp | 5 +++-- platform/settings.cpp | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/map/framework.cpp b/map/framework.cpp index d9a9e44cd3..89a095f71f 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -555,7 +555,8 @@ void Framework::RegisterAllMaps() {{"AvailableStorageSpace", strings::to_string(GetPlatform().GetWritableStorageSpace())}, {"DownloadedMaps", listRegisteredMaps.str()}}); Settings::Set(kLastDownloadedMapsCheck, - duration_cast(system_clock::now().time_since_epoch()).count()); + static_cast(duration_cast( + system_clock::now().time_since_epoch()).count())); } m_searchEngine->SetSupportOldFormat(minFormat < static_cast(version::Format::v3)); @@ -1499,7 +1500,7 @@ void Framework::OnUpdateGpsTrackPointsCallback(vector(mapStyle)); + Settings::Set(kMapStyleKey, static_cast(mapStyle)); GetStyleReader().SetCurrentStyle(mapStyle); alohalytics::TStringMap details {{"mapStyle", strings::to_string(static_cast(mapStyle))}}; diff --git a/platform/settings.cpp b/platform/settings.cpp index 5b874c86c2..0dfb5a4249 100644 --- a/platform/settings.cpp +++ b/platform/settings.cpp @@ -295,12 +295,24 @@ string ToString(uint32_t const & v) return impl::ToStringScalar(v); } +template <> +string ToString(uint64_t const & v) +{ + return impl::ToStringScalar(v); +} + template <> bool FromString(string const & str, uint32_t & v) { return impl::FromStringScalar(str, v); } +template <> +bool FromString(string const & str, uint64_t & v) +{ + return impl::FromStringScalar(str, v); +} + namespace impl { template