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
path: root/3party
diff options
context:
space:
mode:
authorAnatoly Serdtcev <serdtcev@maps.me>2019-04-17 13:30:17 +0300
committermpimenov <mpimenov@users.noreply.github.com>2019-04-19 13:40:36 +0300
commit79d9ac735ab5d710e4eba45cacb889a7657263ef (patch)
treed5809c92ce8629f1e0309b0f5d8340b1159af750 /3party
parenta8581f918810d09c4e212265394c5d17d1a9b430 (diff)
[generator:geo_objects] Fix for review
Diffstat (limited to '3party')
-rw-r--r--3party/jansson/myjansson.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/3party/jansson/myjansson.hpp b/3party/jansson/myjansson.hpp
index a34daaf6e0..1963f4bb48 100644
--- a/3party/jansson/myjansson.hpp
+++ b/3party/jansson/myjansson.hpp
@@ -38,7 +38,7 @@ public:
Json() = default;
explicit Json(std::string_view const & s) { ParseFrom(s); }
- explicit Json(JSONPtr const & json) : m_handle{json.get()} { }
+ explicit Json(JSONPtr && json) { m_handle.AttachNew(json.release()); }
Json GetDeepCopy() const
{
@@ -61,10 +61,10 @@ private:
JsonHandle m_handle;
};
-json_t * GetJSONObligatoryField(json_t * root, char const * field);
json_t * GetJSONObligatoryField(json_t * root, std::string const & field);
-json_t * GetJSONOptionalField(json_t * root, char const * field);
+json_t * GetJSONObligatoryField(json_t * root, char const * field);
json_t * GetJSONOptionalField(json_t * root, std::string const & field);
+json_t * GetJSONOptionalField(json_t * root, char const * field);
bool JSONIsNull(json_t * root);
} // namespace base