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

cleanup, fix compiler/linter issues

Browse Source
This commit is contained in:
Florian Albrechtskirchinger 2022-06-11 17:39:01 +02:00
parent 23857da10e
commit dc809d4ff2
No known key found for this signature in database
GPG Key ID: 19618CE9B2D4BE6D
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/nlohmann/detail/input/input_adapters.hpp
View File

@ -123,7 +123,6 @@ class input_stream_adapter
}; };
#endif // JSON_NO_IO #endif // JSON_NO_IO
// General-purpose iterator-based adapter. It might not be as fast as // General-purpose iterator-based adapter. It might not be as fast as
// theoretically possible for some containers, but it is extremely versatile. // theoretically possible for some containers, but it is extremely versatile.
template<typename IteratorType> template<typename IteratorType>
@ -133,12 +132,11 @@ class iterator_input_adapter
using char_type = typename std::iterator_traits<IteratorType>::value_type; using char_type = typename std::iterator_traits<IteratorType>::value_type;
iterator_input_adapter(IteratorType first, IteratorType last) iterator_input_adapter(IteratorType first, IteratorType last)
: current(std::move(first)), end(std::move(last)), current_has_been_consumed(false) : current(std::move(first)), end(std::move(last))
{} {}
typename std::char_traits<char_type>::int_type get_character() typename std::char_traits<char_type>::int_type get_character()
{ {
if (JSON_HEDLEY_LIKELY(current_has_been_consumed)) if (JSON_HEDLEY_LIKELY(current_has_been_consumed))
{ {
std::advance(current, 1); std::advance(current, 1);
@ -149,18 +147,15 @@ class iterator_input_adapter
current_has_been_consumed = true; current_has_been_consumed = true;
return std::char_traits<char_type>::to_int_type(*current); return std::char_traits<char_type>::to_int_type(*current);
} }
else
{
current_has_been_consumed = false;
return std::char_traits<char_type>::eof();
}
current_has_been_consumed = false;
return std::char_traits<char_type>::eof();
} }
private: private:
mutable IteratorType current; mutable IteratorType current;
const IteratorType end; const IteratorType end;
mutable bool current_has_been_consumed; mutable bool current_has_been_consumed = false;
template<typename BaseInputAdapter, size_t T> template<typename BaseInputAdapter, size_t T>
friend struct wide_string_input_helper; friend struct wide_string_input_helper;
@ -309,7 +304,7 @@ class wide_string_input_adapter
using char_type = char; using char_type = char;
wide_string_input_adapter(BaseInputAdapter base) wide_string_input_adapter(BaseInputAdapter base)
: base_adapter(base) {} : base_adapter(std::move(base)) {}
typename std::char_traits<char>::int_type get_character() noexcept typename std::char_traits<char>::int_type get_character() noexcept
{ {

15
single_include/nlohmann/json.hpp
View File

@ -5834,7 +5834,6 @@ class input_stream_adapter
}; };
#endif // JSON_NO_IO #endif // JSON_NO_IO
// General-purpose iterator-based adapter. It might not be as fast as // General-purpose iterator-based adapter. It might not be as fast as
// theoretically possible for some containers, but it is extremely versatile. // theoretically possible for some containers, but it is extremely versatile.
template<typename IteratorType> template<typename IteratorType>
@ -5844,12 +5843,11 @@ class iterator_input_adapter
using char_type = typename std::iterator_traits<IteratorType>::value_type; using char_type = typename std::iterator_traits<IteratorType>::value_type;
iterator_input_adapter(IteratorType first, IteratorType last) iterator_input_adapter(IteratorType first, IteratorType last)
: current(std::move(first)), end(std::move(last)), current_has_been_consumed(false) : current(std::move(first)), end(std::move(last))
{} {}
typename std::char_traits<char_type>::int_type get_character() typename std::char_traits<char_type>::int_type get_character()
{ {
if (JSON_HEDLEY_LIKELY(current_has_been_consumed)) if (JSON_HEDLEY_LIKELY(current_has_been_consumed))
{ {
std::advance(current, 1); std::advance(current, 1);
@ -5860,18 +5858,15 @@ class iterator_input_adapter
current_has_been_consumed = true; current_has_been_consumed = true;
return std::char_traits<char_type>::to_int_type(*current); return std::char_traits<char_type>::to_int_type(*current);
} }
else
{
current_has_been_consumed = false;
return std::char_traits<char_type>::eof();
}
current_has_been_consumed = false;
return std::char_traits<char_type>::eof();
} }
private: private:
mutable IteratorType current; mutable IteratorType current;
const IteratorType end; const IteratorType end;
mutable bool current_has_been_consumed; mutable bool current_has_been_consumed = false;
template<typename BaseInputAdapter, size_t T> template<typename BaseInputAdapter, size_t T>
friend struct wide_string_input_helper; friend struct wide_string_input_helper;
@ -6020,7 +6015,7 @@ class wide_string_input_adapter
using char_type = char; using char_type = char;
wide_string_input_adapter(BaseInputAdapter base) wide_string_input_adapter(BaseInputAdapter base)
: base_adapter(base) {} : base_adapter(std::move(base)) {}
typename std::char_traits<char>::int_type get_character() noexcept typename std::char_traits<char>::int_type get_character() noexcept
{ {