lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-08-09 05:22:48 +03:00
Code Activity

🔀 merge develop

Browse Source
This commit is contained in:
Niels Lohmann
2024-11-17 07:45:45 +01:00
parent a65d65c724
commit 2e928c39ae
11 changed files with 56 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/nlohmann/detail/input/parser.hpp
View File

@@ -69,7 +69,7 @@ class parser
public:
/// a parser reading from an input adapter
explicit parser(InputAdapterType&& adapter,
parser_callback_t<BasicJsonType>& cb = nullptr,
parser_callback_t<BasicJsonType> cb = nullptr,
const bool allow_exceptions_ = true,
const bool skip_comments = false)
: callback(std::move(cb))

4
include/nlohmann/json.hpp
View File

@@ -4011,7 +4011,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
template<typename InputType>
JSON_HEDLEY_WARN_UNUSED_RESULT
static basic_json parse(InputType&& i,
parser_callback_t& cb = nullptr,
parser_callback_t cb = nullptr,
const bool allow_exceptions = true,
const bool ignore_comments = false)
{
@@ -4026,7 +4026,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
JSON_HEDLEY_WARN_UNUSED_RESULT
static basic_json parse(IteratorType first,
IteratorType last,
parser_callback_t& cb = nullptr,
parser_callback_t cb = nullptr,
const bool allow_exceptions = true,
const bool ignore_comments = false)
{