amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-08-20 16:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Amalgamate source code

Browse Source 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann
2026-08-20 03:46:04 +02:00
parent c8e0f8a249
commit a5e94f4e8b
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
single_include/nlohmann/json.hpp
+10 -3
View File
@@ -7169,8 +7169,15 @@ class iterator_input_adapter
// std::distance) or, in C++20, the sentinel is a sized sentinel for the // std::distance) or, in C++20, the sentinel is a sized sentinel for the
// iterator (std::ranges::distance), e.g. std::default_sentinel_t paired // iterator (std::ranges::distance), e.g. std::default_sentinel_t paired
// with std::counted_iterator. // with std::counted_iterator.
//
// JSON_HAS_RANGES gates the C++20 branch: on standard libraries with an
// incomplete <ranges> (libstdc++ < 11, see #4440) evaluating
// std::contiguous_iterator on a std::counted_iterator is a hard error
// instead of yielding false, and these traits are instantiated for every
// adapter. Such toolchains fall back to the pointer-only test and simply
// use the byte-at-a-time scanner.
static constexpr bool sentinel_is_sized = static constexpr bool sentinel_is_sized =
#if defined(__cpp_lib_concepts) && defined(JSON_HAS_CPP_20) #if JSON_HAS_RANGES && defined(__cpp_lib_concepts) && defined(JSON_HAS_CPP_20)
std::is_same<IteratorType, SentinelType>::value || std::sized_sentinel_for<SentinelType, IteratorType>; std::is_same<IteratorType, SentinelType>::value || std::sized_sentinel_for<SentinelType, IteratorType>;
#else #else
std::is_same<IteratorType, SentinelType>::value; std::is_same<IteratorType, SentinelType>::value;
@@ -7239,7 +7246,7 @@ class iterator_input_adapter
// available element count must also be computable in O(1), hence // available element count must also be computable in O(1), hence
// sentinel_is_sized. // sentinel_is_sized.
static constexpr bool iterator_is_contiguous = sentinel_is_sized && static constexpr bool iterator_is_contiguous = sentinel_is_sized &&
#if defined(__cpp_lib_concepts) && defined(JSON_HAS_CPP_20) #if JSON_HAS_RANGES && defined(__cpp_lib_concepts) && defined(JSON_HAS_CPP_20)
(std::contiguous_iterator<IteratorType> || std::is_pointer<IteratorType>::value); (std::contiguous_iterator<IteratorType> || std::is_pointer<IteratorType>::value);
#else #else
std::is_pointer<IteratorType>::value; std::is_pointer<IteratorType>::value;
@@ -7248,7 +7255,7 @@ class iterator_input_adapter
// number of unread elements in [current, end) // number of unread elements in [current, end)
std::size_t remaining_count() const std::size_t remaining_count() const
{ {
#if defined(__cpp_lib_concepts) && defined(JSON_HAS_CPP_20) #if JSON_HAS_RANGES && defined(__cpp_lib_concepts) && defined(JSON_HAS_CPP_20)
// std::ranges::distance also supports sized sentinels of a different // std::ranges::distance also supports sized sentinels of a different
// type (e.g. std::counted_iterator + std::default_sentinel_t) // type (e.g. std::counted_iterator + std::default_sentinel_t)
return static_cast<std::size_t>(std::ranges::distance(current, end)); return static_cast<std::size_t>(std::ranges::distance(current, end));