fixed amalgation file for #2730
This commit is contained in:
parent
38952643c5
commit
6b267e3cb1
@ -17097,7 +17097,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
||||
detail::parser_callback_t<basic_json>cb = nullptr,
|
||||
const bool allow_exceptions = true,
|
||||
const bool ignore_comments = false
|
||||
)
|
||||
)
|
||||
{
|
||||
return ::nlohmann::detail::parser<basic_json, InputAdapterType>(std::move(adapter),
|
||||
std::move(cb), allow_exceptions, ignore_comments);
|
||||
@ -25751,7 +25751,7 @@ template<>
|
||||
inline void swap<nlohmann::json>(nlohmann::json& j1, nlohmann::json& j2) noexcept( // NOLINT(readability-inconsistent-declaration-parameter-name)
|
||||
is_nothrow_move_constructible<nlohmann::json>::value&& // NOLINT(misc-redundant-expression)
|
||||
is_nothrow_move_assignable<nlohmann::json>::value
|
||||
)
|
||||
)
|
||||
{
|
||||
j1.swap(j2);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user