Merge pull request #226 from lv-zheng/fix_int64

Use namespace std for int64_t and uint64_t

Merge pull request #226 from lv-zheng/fix_int64
Use namespace std for int64_t and uint64_t
54d3cab5 · Niels · 2f63e5fb · 3e76e61b · 54d3cab5 · 54d3cab5
Commit 54d3cab5 authored Mar 29, 2016 by Niels
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

src/json.hpp src/json.hpp +2 -2

src/json.hpp.re2c src/json.hpp.re2c +2 -2

No files found.
--- 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
    >

--- 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
    >