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 '3party/jansson/myjansson.hpp')
-rw-r--r--3party/jansson/myjansson.hpp9
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); }