Merge pull request #226 from lv-zheng/fix_int64

Use namespace std for int64_t and uint64_t
nlohmann · Mar 29, 2016 · 54d3cab · 54d3cab
2 parents 2f63e5f + 3e76e61
commit 54d3cab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/json.hpp b/src/json.hpp
@@ -165,8 +165,8 @@ template <
     template<typename U, typename... Args> class ArrayType = std::vector,
     class StringType = std::string,
     class BooleanType = bool,
-    class NumberIntegerType = int64_t,
-    class NumberUnsignedType = uint64_t,
+    class NumberIntegerType = std::int64_t,
+    class NumberUnsignedType = std::uint64_t,
     class NumberFloatType = double,
     template<typename U> class AllocatorType = std::allocator
     >

diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c
@@ -165,8 +165,8 @@ template <
     template<typename U, typename... Args> class ArrayType = std::vector,
     class StringType = std::string,
     class BooleanType = bool,
-    class NumberIntegerType = int64_t,
-    class NumberUnsignedType = uint64_t,
+    class NumberIntegerType = std::int64_t,
+    class NumberUnsignedType = std::uint64_t,
     class NumberFloatType = double,
     template<typename U> class AllocatorType = std::allocator
     >