gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Linux build fix.

Browse source
This commit is contained in:
Lev Dragunov 2016-03-14 13:32:12 +03:00 • committed by Sergey Yershov
parent 411eca75ce
commit 3e173df0b3
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
map/framework.cpp
View file

@ -555,7 +555,8 @@ void Framework::RegisterAllMaps()
{{"AvailableStorageSpace", strings::to_string(GetPlatform().GetWritableStorageSpace())},
{"DownloadedMaps", listRegisteredMaps.str()}});
Settings::Set(kLastDownloadedMapsCheck,
duration_cast<seconds>(system_clock::now().time_since_epoch()).count());
static_cast<uint64_t>(duration_cast<seconds>(
system_clock::now().time_since_epoch()).count()));
}
m_searchEngine->SetSupportOldFormat(minFormat < static_cast<int>(version::Format::v3));
@ -1499,7 +1500,7 @@ void Framework::OnUpdateGpsTrackPointsCallback(vector<pair<size_t, location::Gps
void Framework::MarkMapStyle(MapStyle mapStyle)
{
// Store current map style before classificator reloading
Settings::Set(kMapStyleKey, static_cast<int>(mapStyle));
Settings::Set(kMapStyleKey, static_cast<uint32_t>(mapStyle));
GetStyleReader().SetCurrentStyle(mapStyle);
alohalytics::TStringMap details {{"mapStyle", strings::to_string(static_cast<int>(mapStyle))}};

12
platform/settings.cpp
View file

@ -295,12 +295,24 @@ string ToString<uint32_t>(uint32_t const & v)
return impl::ToStringScalar<uint32_t>(v);
}
template <>
string ToString<uint64_t>(uint64_t const & v)
{
return impl::ToStringScalar<uint64_t>(v);
}
template <>
bool FromString<uint32_t>(string const & str, uint32_t & v)
{
return impl::FromStringScalar<uint32_t>(str, v);
}
template <>
bool FromString<uint64_t>(string const & str, uint64_t & v)
{
return impl::FromStringScalar<uint64_t>(str, v);
}
namespace impl
{
template <class TPair>