lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-28 12:02:00 +03:00
Code Activity

🚨 fix warning

Browse Source
This commit is contained in:
Niels Lohmann
2024-11-08 23:41:46 +01:00
parent 078d25ed68
commit ad552c41be
6 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -353,7 +353,7 @@ class json_sax_dom_callback_parser
using parse_event_t = typename BasicJsonType::parse_event_t; using parse_event_t = typename BasicJsonType::parse_event_t;
json_sax_dom_callback_parser(BasicJsonType& r, json_sax_dom_callback_parser(BasicJsonType& r,
const parser_callback_t cb, const parser_callback_t& cb,
const bool allow_exceptions_ = true) const bool allow_exceptions_ = true)
: root(r), callback(cb), allow_exceptions(allow_exceptions_) : root(r), callback(cb), allow_exceptions(allow_exceptions_)
{ {

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

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

6
include/nlohmann/detail/output/output_adapters.hpp
View File

@ -31,7 +31,7 @@ template<typename CharType> struct output_adapter_protocol
{ {
virtual void write_character(CharType c) = 0; virtual void write_character(CharType c) = 0;
virtual void write_characters(const CharType* s, std::size_t length) = 0; virtual void write_characters(const CharType* s, std::size_t length) = 0;
virtual ~output_adapter_protocol() = default; virtual ~output_adapter_protocol();
output_adapter_protocol() = default; output_adapter_protocol() = default;
output_adapter_protocol(const output_adapter_protocol&) = default; output_adapter_protocol(const output_adapter_protocol&) = default;
@ -40,6 +40,10 @@ template<typename CharType> struct output_adapter_protocol
output_adapter_protocol& operator=(output_adapter_protocol&&) noexcept = default; output_adapter_protocol& operator=(output_adapter_protocol&&) noexcept = default;
}; };
// explicitly default the destructor to fix portability-template-virtual-member-function
template<typename CharType>
output_adapter_protocol<CharType>::~output_adapter_protocol() = default;
/// a type to simplify interfaces /// a type to simplify interfaces
template<typename CharType> template<typename CharType>
using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>; using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>;

6
include/nlohmann/json.hpp
View File

@ -2424,7 +2424,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
template < class IteratorType, detail::enable_if_t < template < class IteratorType, detail::enable_if_t <
std::is_same<IteratorType, typename basic_json_t::iterator>::value || std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int > = 0 > std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int > = 0 >
IteratorType erase(IteratorType pos) IteratorType erase(IteratorType pos) // NOLINT(performance-unnecessary-value-param)
{ {
// make sure iterator fits the current value // make sure iterator fits the current value
if (JSON_HEDLEY_UNLIKELY(this != pos.m_object)) if (JSON_HEDLEY_UNLIKELY(this != pos.m_object))
@ -4011,7 +4011,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
template<typename InputType> template<typename InputType>
JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_WARN_UNUSED_RESULT
static basic_json parse(InputType&& i, static basic_json parse(InputType&& i,
const parser_callback_t cb = nullptr, const parser_callback_t& cb = nullptr,
const bool allow_exceptions = true, const bool allow_exceptions = true,
const bool ignore_comments = false) const bool ignore_comments = false)
{ {
@ -4026,7 +4026,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_WARN_UNUSED_RESULT
static basic_json parse(IteratorType first, static basic_json parse(IteratorType first,
IteratorType last, IteratorType last,
const parser_callback_t cb = nullptr, const parser_callback_t& cb = nullptr,
const bool allow_exceptions = true, const bool allow_exceptions = true,
const bool ignore_comments = false) const bool ignore_comments = false)
{ {

16
single_include/nlohmann/json.hpp
View File

@ -7037,7 +7037,7 @@ class json_sax_dom_callback_parser
using parse_event_t = typename BasicJsonType::parse_event_t; using parse_event_t = typename BasicJsonType::parse_event_t;
json_sax_dom_callback_parser(BasicJsonType& r, json_sax_dom_callback_parser(BasicJsonType& r,
const parser_callback_t cb, const parser_callback_t& cb,
const bool allow_exceptions_ = true) const bool allow_exceptions_ = true)
: root(r), callback(cb), allow_exceptions(allow_exceptions_) : root(r), callback(cb), allow_exceptions(allow_exceptions_)
{ {
@ -12283,7 +12283,7 @@ class parser
public: public:
/// a parser reading from an input adapter /// a parser reading from an input adapter
explicit parser(InputAdapterType&& adapter, explicit parser(InputAdapterType&& adapter,
const parser_callback_t<BasicJsonType> cb = nullptr, const parser_callback_t<BasicJsonType>& cb = nullptr,
const bool allow_exceptions_ = true, const bool allow_exceptions_ = true,
const bool skip_comments = false) const bool skip_comments = false)
: callback(cb) : callback(cb)
@ -14991,7 +14991,7 @@ template<typename CharType> struct output_adapter_protocol
{ {
virtual void write_character(CharType c) = 0; virtual void write_character(CharType c) = 0;
virtual void write_characters(const CharType* s, std::size_t length) = 0; virtual void write_characters(const CharType* s, std::size_t length) = 0;
virtual ~output_adapter_protocol() = default; virtual ~output_adapter_protocol();
output_adapter_protocol() = default; output_adapter_protocol() = default;
output_adapter_protocol(const output_adapter_protocol&) = default; output_adapter_protocol(const output_adapter_protocol&) = default;
@ -15000,6 +15000,10 @@ template<typename CharType> struct output_adapter_protocol
output_adapter_protocol& operator=(output_adapter_protocol&&) noexcept = default; output_adapter_protocol& operator=(output_adapter_protocol&&) noexcept = default;
}; };
// explicitly default the destructor to fix portability-template-virtual-member-function
template<typename CharType>
output_adapter_protocol<CharType>::~output_adapter_protocol() = default;
/// a type to simplify interfaces /// a type to simplify interfaces
template<typename CharType> template<typename CharType>
using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>; using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>;
@ -21772,7 +21776,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
template < class IteratorType, detail::enable_if_t < template < class IteratorType, detail::enable_if_t <
std::is_same<IteratorType, typename basic_json_t::iterator>::value || std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int > = 0 > std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int > = 0 >
IteratorType erase(IteratorType pos) IteratorType erase(IteratorType pos) // NOLINT(performance-unnecessary-value-param)
{ {
// make sure iterator fits the current value // make sure iterator fits the current value
if (JSON_HEDLEY_UNLIKELY(this != pos.m_object)) if (JSON_HEDLEY_UNLIKELY(this != pos.m_object))
@ -23359,7 +23363,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
template<typename InputType> template<typename InputType>
JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_WARN_UNUSED_RESULT
static basic_json parse(InputType&& i, static basic_json parse(InputType&& i,
const parser_callback_t cb = nullptr, const parser_callback_t& cb = nullptr,
const bool allow_exceptions = true, const bool allow_exceptions = true,
const bool ignore_comments = false) const bool ignore_comments = false)
{ {
@ -23374,7 +23378,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_WARN_UNUSED_RESULT
static basic_json parse(IteratorType first, static basic_json parse(IteratorType first,
IteratorType last, IteratorType last,
const parser_callback_t cb = nullptr, const parser_callback_t& cb = nullptr,
const bool allow_exceptions = true, const bool allow_exceptions = true,
const bool ignore_comments = false) const bool ignore_comments = false)
{ {

4
tests/src/unit-alt-string.cpp
View File

@ -16,8 +16,8 @@
/* forward declarations */ /* forward declarations */
class alt_string; class alt_string;
bool operator<(const char* op1, const alt_string& op2) noexcept; bool operator<(const char* op1, const alt_string& op2) noexcept; // NOLINT(misc-use-internal-linkage)
void int_to_string(alt_string& target, std::size_t value); void int_to_string(alt_string& target, std::size_t value); // NOLINT(misc-use-internal-linkage)
/* /*
* This is virtually a string class. * This is virtually a string class.