Merge pull request #266 from 06needhamt/Issue

Fix Issue #265
nlohmann · Jun 14, 2016 · 9eb86e1 · 9eb86e1
2 parents 39213bf + fb90388
commit 9eb86e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/json.hpp b/src/json.hpp
@@ -8504,7 +8504,7 @@ class basic_json
  else
  {
  type = value_t::number_unsigned;
- max = static_cast<uint64_t>((std::numeric_limits<number_unsigned_t>::max()));
+ max = static_cast<uint64_t>((std::numeric_limits<number_unsigned_t>::max)());
  }
 
  // count the significant figures

diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c
@@ -7814,7 +7814,7 @@ class basic_json
  else
  {
  type = value_t::number_unsigned;
- max = static_cast<uint64_t>((std::numeric_limits<number_unsigned_t>::max()));
+ max = static_cast<uint64_t>((std::numeric_limits<number_unsigned_t>::max)());
  }
 
  // count the significant figures