From 2df8f12c090106ad32df99480f7a19e936c5f143 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 23 Apr 2017 20:51:29 +0200 Subject: [PATCH 1/4] :checkered_flag: another fix for MSVC #464 needed for VS2015.3 with /std:c++latest --- src/json.hpp | 2 +- src/json.hpp.re2c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/json.hpp b/src/json.hpp index 49dfd0136..8a8b876a7 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -3730,7 +3730,7 @@ class basic_json #ifndef _MSC_VER // fix for issue #167 operator<< ambiguity under VS2015 and not std::is_same>::value #endif -#if defined(_MSC_VER) && defined(_HAS_CXX17) && _HAS_CXX17 == 1 // fix for issue #464 +#if defined(_MSC_VER) && _MSC_VER >1900 && defined(_HAS_CXX17) && _HAS_CXX17 == 1 // fix for issue #464 and not std::is_same::value #endif , int >::type = 0 > diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c index 48c8eb0d6..5dc86d1e2 100644 --- a/src/json.hpp.re2c +++ b/src/json.hpp.re2c @@ -3730,7 +3730,7 @@ class basic_json #ifndef _MSC_VER // fix for issue #167 operator<< ambiguity under VS2015 and not std::is_same>::value #endif -#if defined(_MSC_VER) && defined(_HAS_CXX17) && _HAS_CXX17 == 1 // fix for issue #464 +#if defined(_MSC_VER) && _MSC_VER >1900 && defined(_HAS_CXX17) && _HAS_CXX17 == 1 // fix for issue #464 and not std::is_same::value #endif , int >::type = 0 > From c42273d2a052545b34f1d10d6a78696c2e641b7b Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 23 Apr 2017 21:46:30 +0200 Subject: [PATCH 2/4] :memo: fixed documentation #565 The documentation mismatched the actual code. --- README.md | 1 + doc/index.md | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 265ec06f1..fc6dde9bc 100644 --- a/README.md +++ b/README.md @@ -835,6 +835,7 @@ I deeply appreciate the help of the following people. - [Krzysztof Woś](https://github.com/krzysztofwos) made exceptions more visible. - [ftillier](https://github.com/ftillier) fixed a compiler warning. - [tinloaf](https://github.com/tinloaf) made sure all pushed warnings are properly popped. +- [Fytch](https://github.com/Fytch) found a bug in the documentation. Thanks a lot for helping out! Please [let me know](mailto:mail@nlohmann.me) if I forgot someone. diff --git a/doc/index.md b/doc/index.md index 9493412e8..5392f4d3c 100644 --- a/doc/index.md +++ b/doc/index.md @@ -254,21 +254,21 @@ The container functions known from STL have been extended to support the differe lookup `find` - @link nlohmann::basic_json::find `find` @endlink (returns `end()`) @link nlohmann::basic_json::find `find` @endlink @link nlohmann::basic_json::find `find` @endlink (returns `end()`) @link nlohmann::basic_json::find `find` @endlink (returns `end()`) @link nlohmann::basic_json::find `find` @endlink (returns `end()`) @link nlohmann::basic_json::find `find` @endlink (returns `end()`) + @link nlohmann::basic_json::find `find` @endlink (returns `end()`) `count` - @link nlohmann::basic_json::count `count` @endlink (returns `0`) @link nlohmann::basic_json::count `count` @endlink @link nlohmann::basic_json::count `count` @endlink (returns `0`) @link nlohmann::basic_json::count `count` @endlink (returns `0`) @link nlohmann::basic_json::count `count` @endlink (returns `0`) @link nlohmann::basic_json::count `count` @endlink (returns `0`) + @link nlohmann::basic_json::count `count` @endlink (returns `0`) From 19d2dec8b6d1005665d1c5ae003297c1c2d95963 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 3 May 2017 22:49:21 +0200 Subject: [PATCH 3/4] :memo: added badge from isitmaintained.com --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fc6dde9bc..6e345eba5 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/nlohmann/json/master/LICENSE.MIT) [![Github Releases](https://img.shields.io/github/release/nlohmann/json.svg)](https://github.com/nlohmann/json/releases) [![Github Issues](https://img.shields.io/github/issues/nlohmann/json.svg)](http://github.com/nlohmann/json/issues) +[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/nlohmann/json.svg)](http://isitmaintained.com/project/nlohmann/json "Average time to resolve an issue") [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/289/badge)](https://bestpractices.coreinfrastructure.org/projects/289) - [Design goals](#design-goals) From ecf895f2d13ed315ad3a7b64367745da1bd8e4cb Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Fri, 5 May 2017 16:42:22 +0200 Subject: [PATCH 4/4] :memo: mentioned value function on main doc page #570 --- doc/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/index.md b/doc/index.md index 5392f4d3c..0a7b45c8e 100644 --- a/doc/index.md +++ b/doc/index.md @@ -27,6 +27,7 @@ These pages contain the API documentation of JSON for Modern C++, a C++11 header - @link nlohmann::basic_json::get_ptr get_ptr @endlink -- get a value pointer - @link nlohmann::basic_json::get_ref get_ref @endlink -- get a value reference - @link nlohmann::basic_json::operator ValueType() const operator ValueType @endlink -- get a value (implicit conversion) + - @link nlohmann::basic_json::value value @endlink -- get a value from an object and return default value if key is not present - lexicographical comparison operators - serialization - deserialization