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:
Diffstat (limited to 'partners_api/locals_api.cpp')
-rw-r--r--partners_api/locals_api.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/partners_api/locals_api.cpp b/partners_api/locals_api.cpp
index fd06b22dbd..f8bce6e258 100644
--- a/partners_api/locals_api.cpp
+++ b/partners_api/locals_api.cpp
@@ -24,7 +24,7 @@ void ParseError(std::string const & src, int & errorCode, std::string & message)
{
message.clear();
errorCode = 0;
- my::Json root(src.c_str());
+ base::Json root(src.c_str());
FromJSONObject(root.get(), "code", errorCode);
FromJSONObject(root.get(), "message", message);
}
@@ -33,9 +33,9 @@ void ParseLocals(std::string const & src, std::vector<LocalExpert> & locals,
bool & hasPrevious, bool & hasNext)
{
locals.clear();
- my::Json root(src.c_str());
- auto previousField = my::GetJSONOptionalField(root.get(), "previous");
- auto nextField = my::GetJSONOptionalField(root.get(), "next");
+ base::Json root(src.c_str());
+ auto previousField = base::GetJSONOptionalField(root.get(), "previous");
+ auto nextField = base::GetJSONOptionalField(root.get(), "next");
hasPrevious = json_is_number(previousField);
hasNext = json_is_number(nextField);
auto const results = json_object_get(root.get(), "results");
@@ -117,7 +117,7 @@ uint64_t Api::GetLocals(double lat, double lon, std::string const & lang,
LOG(LWARNING, ("Locals request failed:", errorCode, errorMessage));
return errorFn(id, errorCode, errorMessage);
}
- catch (my::Json::Exception const & e)
+ catch (base::Json::Exception const & e)
{
LOG(LWARNING, ("Unknown error:", e.Msg(), ", response:", result));
return errorFn(id, kUnknownErrorCode, "Unknown error: " + e.Msg());
@@ -131,7 +131,7 @@ uint64_t Api::GetLocals(double lat, double lon, std::string const & lang,
{
ParseLocals(result, locals, hasPreviousPage, hasNextPage);
}
- catch (my::Json::Exception const & e)
+ catch (base::Json::Exception const & e)
{
LOG(LWARNING, ("Locals response parsing failed:", e.Msg(), ", response:", result));
errorFn(id, kUnknownErrorCode, "Response parsing failed: " + e.Msg());