diff options
| author | Maxim Pimenov <m@maps.me> | 2018-07-18 23:40:19 +0300 |
|---|---|---|
| committer | Tatiana Yan <tatiana.kondakova@gmail.com> | 2018-07-19 14:01:59 +0300 |
| commit | 1df068457991f32bf62a05d31adc74eabe276f0c (patch) | |
| tree | 5de610420ba28439f115c96661bec7960c98a5a5 /3party | |
| parent | 46d5cd803a7896260387dc0201ef0240888e0ca9 (diff) | |
[geocoder] Reading the hierarchy from json.
Diffstat (limited to '3party')
| -rw-r--r-- | 3party/jansson/myjansson.hpp | 5 | ||||
| -rw-r--r-- | 3party/jansson/src/jansson.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/3party/jansson/myjansson.hpp b/3party/jansson/myjansson.hpp index cfeb2b35e7..24f7b9a8d4 100644 --- a/3party/jansson/myjansson.hpp +++ b/3party/jansson/myjansson.hpp @@ -31,8 +31,6 @@ inline JSONPtr NewJSONNull() { return JSONPtr(json_null()); } class Json { - JsonHandle m_handle; - public: DECLARE_EXCEPTION(Exception, RootException); @@ -51,6 +49,9 @@ public: json_t * get() const { return m_handle.get(); } json_t * get_deep_copy() const { return json_deep_copy(get()); } + +private: + JsonHandle m_handle; }; json_t * GetJSONObligatoryField(json_t * root, std::string const & field); diff --git a/3party/jansson/src/jansson.h b/3party/jansson/src/jansson.h index 7ad6f0e778..c731028eb8 100644 --- a/3party/jansson/src/jansson.h +++ b/3party/jansson/src/jansson.h @@ -12,7 +12,7 @@ #include <stdlib.h> /* for size_t */ #include <stdarg.h> -#include <jansson_config.h> +#include "jansson_config.h" #ifdef __cplusplus extern "C" { |