Merge branch 'develop' of https://github.com/nlohmann/json into diagnostics

 Conflicts:
	include/nlohmann/detail/input/parser.hpp
	single_include/nlohmann/json.hpp
This commit is contained in:
Niels Lohmann committed 2021-02-07 17:45:09 +01:00
commit 4917e7c259
9 files changed
+577 -669

No files matched your search

@@ -39,7 +39,7 @@ template<typename IteratorType> class iteration_proxy_value
/// a string representation of the array index
mutable string_type array_index_str = "0";
/// an empty string (to return a reference for primitive values)
const string_type empty_str = "";
const string_type empty_str{};
public:
explicit iteration_proxy_value(IteratorType it) noexcept : anchor(it) {}