diff options
| author | Yuri Gorshenin <y@maps.me> | 2017-04-19 13:51:25 +0300 |
|---|---|---|
| committer | Vladimir Byko-Ianko <bykoianko@gmail.com> | 2017-04-19 15:08:21 +0300 |
| commit | 6d3583c937b1878c8f796e659ef03d038cde17ab (patch) | |
| tree | 79e92b416ac471e93ac7024c294419afba84822f /3party/jansson/myjansson.hpp | |
| parent | acd974ec22d3a49785412bfcc2b602277156b4c9 (diff) | |
[build] Various fixes to master build.
Diffstat (limited to '3party/jansson/myjansson.hpp')
| -rw-r--r-- | 3party/jansson/myjansson.hpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/3party/jansson/myjansson.hpp b/3party/jansson/myjansson.hpp index 3945675e8a..7b68c4211e 100644 --- a/3party/jansson/myjansson.hpp +++ b/3party/jansson/myjansson.hpp @@ -5,6 +5,7 @@ #include "base/exception.hpp" #include "base/string_utils.hpp" +#include <cstdint> #include <memory> #include <string> #include <vector> @@ -49,9 +50,11 @@ json_t * GetJSONOptionalField(json_t * root, std::string const & field); inline void FromJSON(json_t * root, json_t *& value) { value = root; } void FromJSONObject(json_t * root, std::string const & field, double & result); -void FromJSONObject(json_t * root, std::string const & field, json_int_t & result); +void FromJSONObject(json_t * root, std::string const & field, int & result); +void FromJSONObject(json_t * root, std::string const & field, int64_t & result); -void FromJSONObjectOptionalField(json_t * root, std::string const & field, json_int_t & result); +void FromJSONObjectOptionalField(json_t * root, std::string const & field, int & result); +void FromJSONObjectOptionalField(json_t * root, std::string const & field, int64_t & result); void FromJSONObjectOptionalField(json_t * root, std::string const & field, double & result); void FromJSONObjectOptionalField(json_t * root, std::string const & field, bool & result, bool def = false); @@ -59,7 +62,7 @@ void FromJSONObjectOptionalField(json_t * root, std::string const & field, json_ void ToJSONObject(json_t & root, std::string const & field, double value); void ToJSONObject(json_t & root, std::string const & field, int value); -void ToJSONObject(json_t & root, std::string const & field, json_int_t value); +void ToJSONObject(json_t & root, std::string const & field, int64_t value); void FromJSON(json_t * root, std::string & result); inline my::JSONPtr ToJSON(std::string const & s) { return my::NewJSONString(s); } |