diff options
| -rw-r--r-- | libstdc++-v3/include/std/span | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/stacktrace | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/include/std/span b/libstdc++-v3/include/std/span index 00fc527..b7392a0 100644 --- a/libstdc++-v3/include/std/span +++ b/libstdc++-v3/include/std/span @@ -123,6 +123,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION using __is_compatible_ref = __is_array_convertible<_Type, remove_reference_t<_Ref>>; + // Nested type so that _Type is not an associated class of iterator. + struct __iter_tag; + public: // member types using element_type = _Type; @@ -133,7 +136,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION using const_pointer = const _Type*; using reference = element_type&; using const_reference = const element_type&; - using iterator = __gnu_cxx::__normal_iterator<pointer, span>; + using iterator = __gnu_cxx::__normal_iterator<pointer, __iter_tag>; using reverse_iterator = std::reverse_iterator<iterator>; #if __cplusplus > 202002L using const_iterator = std::const_iterator<iterator>; diff --git a/libstdc++-v3/include/std/stacktrace b/libstdc++-v3/include/std/stacktrace index cd26062..cdd1276 100644 --- a/libstdc++-v3/include/std/stacktrace +++ b/libstdc++-v3/include/std/stacktrace @@ -179,13 +179,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { using _AllocTraits = allocator_traits<_Allocator>; using uintptr_t = __UINTPTR_TYPE__; + struct _Impl; public: using value_type = stacktrace_entry; using const_reference = const value_type&; using reference = value_type&; using const_iterator - = __gnu_cxx::__normal_iterator<value_type*, basic_stacktrace>; + = __gnu_cxx::__normal_iterator<typename _AllocTraits::const_pointer, + _Impl>; using iterator = const_iterator; using reverse_iterator = std::reverse_iterator<iterator>; using const_reverse_iterator = std::reverse_iterator<const_iterator>; |