External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issues reported by clang-tidy and more aggressive gcc flags for ci jobs

Browse Source
This commit is contained in:
Raphael Grimm 2021-09-25 12:38:42 +02:00
parent 1b11773cd6
commit a36fb85750
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/nlohmann/detail/json_metadata.hpp
View File

@ -18,7 +18,7 @@ class json_metadata
return m_metadata; return m_metadata;
} }
private: private:
metadata_t m_metadata; metadata_t m_metadata = {};
}; };
template<> template<>

3
include/nlohmann/json.hpp
View File

@ -2333,11 +2333,10 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
// check that passed value is valid // check that passed value is valid
other.assert_invariant(); other.assert_invariant();
json_metadata_t::operator=(std::move(other));
using std::swap; using std::swap;
swap(m_type, other.m_type); swap(m_type, other.m_type);
swap(m_value, other.m_value); swap(m_value, other.m_value);
json_metadata_t::operator=(std::move(other));
set_parents(); set_parents();
assert_invariant(); assert_invariant();

7
single_include/nlohmann/json.hpp
View File

@ -12377,7 +12377,7 @@ class json_metadata
return m_metadata; return m_metadata;
} }
private: private:
metadata_t m_metadata; metadata_t m_metadata = {};
}; };
template<> template<>
@ -17649,7 +17649,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
detail::parser_callback_t<basic_json>cb = nullptr, detail::parser_callback_t<basic_json>cb = nullptr,
const bool allow_exceptions = true, const bool allow_exceptions = true,
const bool ignore_comments = false const bool ignore_comments = false
) )
{ {
return ::nlohmann::detail::parser<basic_json, InputAdapterType>(std::move(adapter), return ::nlohmann::detail::parser<basic_json, InputAdapterType>(std::move(adapter),
std::move(cb), allow_exceptions, ignore_comments); std::move(cb), allow_exceptions, ignore_comments);
@ -19772,11 +19772,10 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
// check that passed value is valid // check that passed value is valid
other.assert_invariant(); other.assert_invariant();
json_metadata_t::operator=(std::move(other));
using std::swap; using std::swap;
swap(m_type, other.m_type); swap(m_type, other.m_type);
swap(m_value, other.m_value); swap(m_value, other.m_value);
json_metadata_t::operator=(std::move(other));
set_parents(); set_parents();
assert_invariant(); assert_invariant();