mirror of
https://github.com/nlohmann/json.git
synced 2026-10-01 14:35:18 +00:00
Merge branch 'json-view/12-view-values' into json-view/13-view-dump
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
@@ -40,6 +40,8 @@ class string_ref
|
||||
using const_iterator = const char*;
|
||||
|
||||
string_ref() noexcept = default;
|
||||
// s must be null-terminated, as for std::string_view(const char*)
|
||||
// flawfinder: ignore
|
||||
string_ref(const char* s) : m_data(s), m_size(std::strlen(s)) {} // NOLINT(google-explicit-constructor,hicpp-explicit-conversions)
|
||||
string_ref(const char* s, std::size_t n) noexcept : m_data(s), m_size(n) {}
|
||||
template<typename Traits, typename Alloc>
|
||||
|
||||
@@ -824,6 +824,7 @@ class basic_json_document
|
||||
|
||||
/// parse into this document, reusing its memory
|
||||
template<typename InputType>
|
||||
// flawfinder: ignore (a member function, not POSIX read())
|
||||
void read(InputType&& input,
|
||||
const bool allow_exceptions = true,
|
||||
const bool ignore_comments = false,
|
||||
@@ -990,6 +991,8 @@ class basic_json_document
|
||||
return;
|
||||
}
|
||||
const char* cs = reinterpret_cast<const char*>(s); // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
|
||||
// C strings are null-terminated, as for json::parse(const char*)
|
||||
// flawfinder: ignore
|
||||
build(cs, std::strlen(cs), ae, c, tc, false, true);
|
||||
}
|
||||
|
||||
|
||||
@@ -3035,6 +3035,8 @@ class string_ref
|
||||
using const_iterator = const char*;
|
||||
|
||||
string_ref() noexcept = default;
|
||||
// s must be null-terminated, as for std::string_view(const char*)
|
||||
// flawfinder: ignore
|
||||
string_ref(const char* s) : m_data(s), m_size(std::strlen(s)) {} // NOLINT(google-explicit-constructor,hicpp-explicit-conversions)
|
||||
string_ref(const char* s, std::size_t n) noexcept : m_data(s), m_size(n) {}
|
||||
template<typename Traits, typename Alloc>
|
||||
@@ -3985,6 +3987,7 @@ class basic_json_document
|
||||
|
||||
/// parse into this document, reusing its memory
|
||||
template<typename InputType>
|
||||
// flawfinder: ignore (a member function, not POSIX read())
|
||||
void read(InputType&& input,
|
||||
const bool allow_exceptions = true,
|
||||
const bool ignore_comments = false,
|
||||
@@ -4151,6 +4154,8 @@ class basic_json_document
|
||||
return;
|
||||
}
|
||||
const char* cs = reinterpret_cast<const char*>(s); // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
|
||||
// C strings are null-terminated, as for json::parse(const char*)
|
||||
// flawfinder: ignore
|
||||
build(cs, std::strlen(cs), ae, c, tc, false, true);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user