Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Zverev <zverik@textual.ru>2017-08-14 18:23:54 +0300
committers.magidovich <s.magidovich@mapsme5.devmail.ru>2017-09-01 15:02:36 +0300
commit8fd74ba2db42fe83a128b53ee127ea977cd34369 (patch)
treeb30d660ac3b1822e7aefe9ed694e6ff3983e23a0
parentd07aa1e617854750163514548869f870e920b871 (diff)
[storage] Fix build on gccopenlr-traffix-adhock-build
-rw-r--r--storage/diff_scheme/diff_scheme_checker.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/storage/diff_scheme/diff_scheme_checker.cpp b/storage/diff_scheme/diff_scheme_checker.cpp
index 800e909059..f523a0ed86 100644
--- a/storage/diff_scheme/diff_scheme_checker.cpp
+++ b/storage/diff_scheme/diff_scheme_checker.cpp
@@ -48,22 +48,22 @@ NameFileInfoMap DeserializeResponse(string const & response, Checker::NameVersio
if (response.empty())
{
LOG(LERROR, ("Diff response shouldn't be empty."));
- return {};
+ return NameFileInfoMap{};
}
my::Json const json(response.c_str());
if (json.get() == nullptr)
- return {};
+ return NameFileInfoMap{};
auto const root = json_object_get(json.get(), kMwmsKey);
if (root == nullptr || !json_is_array(root))
- return {};
+ return NameFileInfoMap{};
auto const size = json_array_size(root);
if (size == 0 || size != nameVersionMap.size())
{
LOG(LERROR, ("Diff list size in response must be equal to mwm list size in request."));
- return {};
+ return NameFileInfoMap{};
}
NameFileInfoMap diffs;
@@ -75,7 +75,7 @@ NameFileInfoMap DeserializeResponse(string const & response, Checker::NameVersio
if (!node)
{
LOG(LERROR, ("Incorrect server response."));
- return {};
+ return NameFileInfoMap{};
}
string name;
@@ -89,7 +89,7 @@ NameFileInfoMap DeserializeResponse(string const & response, Checker::NameVersio
if (nameVersionMap.find(name) == nameVersionMap.end())
{
LOG(LERROR, ("Incorrect country name in response:", name));
- return {};
+ return NameFileInfoMap{};
}
FileInfo info(size, nameVersionMap.at(name));
@@ -108,7 +108,7 @@ void Checker::Check(LocalMapsInfo const & info, Callback const & fn)
// TODO(Vlad): Log falling back to old scheme.
if (info.m_localMaps.empty())
{
- fn({});
+ fn(NameFileInfoMap{});
return;
}