diff options
| author | GitHub Actions <action@github.com> | 2020-06-28 14:43:46 +0300 |
|---|---|---|
| committer | GitHub Actions <action@github.com> | 2020-06-28 14:43:46 +0300 |
| commit | 20676cc5a8831feeba46c5dcc9692d6a77faa32c (patch) | |
| tree | 4d6ac94f1a312749fd9cdf6f3faa15ec90981b9a | |
| parent | d999f29d0ac659887cfed67cfbde14f671b3254b (diff) | |
Upstream release v2.0.4v2.0.4
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | include/nlohmann/json.hpp | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -13,7 +13,7 @@ include(FetchContent) FetchContent_Declare(json GIT_REPOSITORY https://github.com/ArthurSonzogni/nlohman_json - GIT_TAG v2.0.3) + GIT_TAG v2.0.4) FetchContent_GetProperties(json) if(NOT json_POPULATED) diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 25a9dbc..fd548c2 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ -| | |__ | | | | | | version 2.0.3 +| | |__ | | | | | | version 2.0.4 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License <http://opensource.org/licenses/MIT>. @@ -8592,7 +8592,7 @@ basic_json_parser_63: const auto offset_cursor = m_cursor - m_start; // no stream is used or end of file is reached - if (m_stream == nullptr or not * m_stream) + if (m_stream == nullptr or m_stream->eof()) { // copy unprocessed characters to line buffer m_line_buffer.clear(); @@ -10116,7 +10116,7 @@ basic_json_parser_63: json_pointer top_pointer = ptr.top(); if (top_pointer != ptr) { - basic_json& x = result.at(top_pointer); + result.at(top_pointer); } // get reference to parent of JSON pointer ptr |