diff --git a/ChangeLog.md b/ChangeLog.md index 01309cb7db..432d43c6f8 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,18 @@ +version 0.113.2 +--------------- + +Bug fix + +- On Windows platforms, fixed issue with macro expansion of max when + including windows.h + +version 0.113.1 +--------------- + +Bug fix + +- Fixed compile issue with j = json::make_array(). + version 0.113.1 --------------- diff --git a/README.md b/README.md index 1f02b9512e..731744cca2 100644 --- a/README.md +++ b/README.md @@ -201,8 +201,7 @@ The library includes four instantiations of `basic_json`: ```c++ #include -#include -#include +#include #include #include @@ -217,7 +216,7 @@ int main() writer.begin_array(); // indefinite length outer array writer.begin_array(3); // a fixed length array writer.string_value("foo"); - writer.byte_string_value(byte_string{'P','u','s','s'}); // default conversion to base64url + writer.byte_string_value(byte_string{'P','u','s','s'}); // no suggested conversion writer.bignum_value("-18446744073709551617"); writer.end_array(); writer.end_array(); @@ -273,7 +272,7 @@ int main() json another_array = json::array(); another_array.emplace_back(byte_string({'P','u','s','s'}), - byte_string_chars_format::base64); // expected conversion to base64 + byte_string_chars_format::base64); // suggested conversion to base64 another_array.emplace_back("273.15", semantic_tag_type::decimal_fraction); another_array.emplace(another_array.array_range().begin(),"bar"); // place at front diff --git a/examples/src/readme_examples.cpp b/examples/src/readme_examples.cpp index 023c547955..4a7e9f7afb 100644 --- a/examples/src/readme_examples.cpp +++ b/examples/src/readme_examples.cpp @@ -4,8 +4,7 @@ #include #include #include -#include -#include +#include #include #include diff --git a/examples/src/staj_iterator_examples.cpp b/examples/src/staj_iterator_examples.cpp index 6acb986fe8..84c5edb13d 100644 --- a/examples/src/staj_iterator_examples.cpp +++ b/examples/src/staj_iterator_examples.cpp @@ -1,9 +1,9 @@ // Copyright 2013 Daniel Parker // Distributed under Boost license +#include #include #include -#include #include #include diff --git a/include/jsoncons/bignum.hpp b/include/jsoncons/bignum.hpp index 4240059dfe..cf697e1799 100644 --- a/include/jsoncons/bignum.hpp +++ b/include/jsoncons/bignum.hpp @@ -1459,7 +1459,7 @@ class basic_bignum : protected basic_bignum_base }; template -const uint64_t basic_bignum::max_basic_type = std::numeric_limits::max(); +const uint64_t basic_bignum::max_basic_type = (std::numeric_limits::max)(); template const uint64_t basic_bignum::basic_type_bits = sizeof(uint64_t) * 8; // Number of bits template diff --git a/include/jsoncons/config/version.hpp b/include/jsoncons/config/version.hpp index 8913a0ed42..b734d5234d 100644 --- a/include/jsoncons/config/version.hpp +++ b/include/jsoncons/config/version.hpp @@ -11,7 +11,7 @@ #define JSONCONS_VERSION_MAJOR 0 #define JSONCONS_VERSION_MINOR 113 -#define JSONCONS_VERSION_PATCH 1 +#define JSONCONS_VERSION_PATCH 2 namespace jsoncons { diff --git a/tests/src/bignum_tests.cpp b/tests/src/bignum_tests.cpp index bb784a9f26..bb93346d7a 100644 --- a/tests/src/bignum_tests.cpp +++ b/tests/src/bignum_tests.cpp @@ -1,6 +1,9 @@ // Copyright 2013 Daniel Parker // Distributed under Boost license +#if defined(_MSC_VER) +#include "windows.h" +#endif #include #include #include @@ -76,7 +79,7 @@ TEST_CASE("test_negative_bignum") TEST_CASE("test_longlong") { - long long n = std::numeric_limits::max(); + long long n = (std::numeric_limits::max)(); bignum val = n;