wt/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-11-10 16:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Iterator ranges: astyle-safe trait members; reserve in the test helper

Browse Source 
The byte check and the container match are static constexpr members
instead of integral_constant arguments and a default template argument
with comparisons, which astyle spaced out.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann committed 2026-11-07 10:12:50 +01:00
1 parent bfd8e867b6
commit b45012fcf3
3 files changed
+31 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/nlohmann/detail/input/input_adapters.hpp
+15 -6
View File
@@ -1186,17 +1186,26 @@ other iterator can be mistaken for one. (std::basic_string is only matched for
char: other character types need std::char_traits specializations that the char: other character types need std::char_traits specializations that the
standard library need not have.) standard library need not have.)
*/ */
template < typename IteratorType, typename CharType, bool IsByte = sizeof(CharType) == 1 && std::is_integral<CharType>::value && !std::is_same<CharType, bool>::value > template<typename CharType>
struct is_byte_char_type
{
// a member, not an integral_constant argument, which astyle misformats
static constexpr bool value = sizeof(CharType) == 1 && std::is_integral<CharType>::value && !std::is_same<CharType, bool>::value;
};
template<typename IteratorType, typename CharType, bool IsByte = is_byte_char_type<CharType>::value>
struct is_std_contiguous_byte_iterator_impl : std::false_type {}; struct is_std_contiguous_byte_iterator_impl : std::false_type {};
// (the containers are only named for byte types) // (the containers are only named for byte types)
template<typename IteratorType, typename CharType> template<typename IteratorType, typename CharType>
struct is_std_contiguous_byte_iterator_impl<IteratorType, CharType, true> struct is_std_contiguous_byte_iterator_impl<IteratorType, CharType, true>
: std::integral_constant < bool, !std::is_pointer<IteratorType>::value {
&& (std::is_same<IteratorType, typename std::vector<CharType>::iterator>::value static constexpr bool value = !std::is_pointer<IteratorType>::value
|| std::is_same<IteratorType, typename std::vector<CharType>::const_iterator>::value && (std::is_same<IteratorType, typename std::vector<CharType>::iterator>::value
|| std::is_same<IteratorType, std::string::iterator>::value || std::is_same<IteratorType, typename std::vector<CharType>::const_iterator>::value
|| std::is_same<IteratorType, std::string::const_iterator>::value) > {}; || std::is_same<IteratorType, std::string::iterator>::value
|| std::is_same<IteratorType, std::string::const_iterator>::value);
};
template<typename IteratorType> template<typename IteratorType>
struct is_std_contiguous_byte_iterator struct is_std_contiguous_byte_iterator
single_include/nlohmann/json.hpp
Generated
+15 -6
View File
@@ -10295,17 +10295,26 @@ other iterator can be mistaken for one. (std::basic_string is only matched for
char: other character types need std::char_traits specializations that the char: other character types need std::char_traits specializations that the
standard library need not have.) standard library need not have.)
*/ */
template < typename IteratorType, typename CharType, bool IsByte = sizeof(CharType) == 1 && std::is_integral<CharType>::value && !std::is_same<CharType, bool>::value > template<typename CharType>
struct is_byte_char_type
{
// a member, not an integral_constant argument, which astyle misformats
static constexpr bool value = sizeof(CharType) == 1 && std::is_integral<CharType>::value && !std::is_same<CharType, bool>::value;
};
template<typename IteratorType, typename CharType, bool IsByte = is_byte_char_type<CharType>::value>
struct is_std_contiguous_byte_iterator_impl : std::false_type {}; struct is_std_contiguous_byte_iterator_impl : std::false_type {};
// (the containers are only named for byte types) // (the containers are only named for byte types)
template<typename IteratorType, typename CharType> template<typename IteratorType, typename CharType>
struct is_std_contiguous_byte_iterator_impl<IteratorType, CharType, true> struct is_std_contiguous_byte_iterator_impl<IteratorType, CharType, true>
: std::integral_constant < bool, !std::is_pointer<IteratorType>::value {
&& (std::is_same<IteratorType, typename std::vector<CharType>::iterator>::value static constexpr bool value = !std::is_pointer<IteratorType>::value
|| std::is_same<IteratorType, typename std::vector<CharType>::const_iterator>::value && (std::is_same<IteratorType, typename std::vector<CharType>::iterator>::value
|| std::is_same<IteratorType, std::string::iterator>::value || std::is_same<IteratorType, typename std::vector<CharType>::const_iterator>::value
|| std::is_same<IteratorType, std::string::const_iterator>::value) > {}; || std::is_same<IteratorType, std::string::iterator>::value
|| std::is_same<IteratorType, std::string::const_iterator>::value);
};
template<typename IteratorType> template<typename IteratorType>
struct is_std_contiguous_byte_iterator struct is_std_contiguous_byte_iterator
tests/src/unit-deserialization.cpp
+1
View File
@@ -1433,6 +1433,7 @@ template<typename T>
std::vector<T> bytes_as(const std::string& text) std::vector<T> bytes_as(const std::string& text)
{ {
std::vector<T> result; std::vector<T> result;
result.reserve(text.size());
for (const char c : text) for (const char c : text)
{ {
result.push_back(static_cast<T>(c)); result.push_back(static_cast<T>(c));