This is the mail archive of the mailing list for the libstdc++ project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] Apply C++20 changes to various iterator types

On 30/10/19 15:47 +0000, Jonathan Wakely wrote:
This ensures that __normal_iterator<T*, C> satisfies the
contiguous_iterator concept, by defining the iterator_concept member

Also update vector<bool>'s iterators, reverse_iterator,
istreambuf_iterator and ostreambuf_iterator to meet the C++20

	PR libstdc++/92272
	* include/bits/stl_bvector.h (_Bit_iterator::pointer)
	(_Bit_const_iterator::pointer): Define as void for C++20.
	* include/bits/stl_iterator.h (reverse_iterator::operator->()): Add
	constraints for C++20.
	(__normal_iterator::iterator_concept): Define for C++20.

I broke Clang again with that part. Fixed like so.

Tested powerpc64le-linux, committed to trunk.

commit 0649504b11da5e63511b6ee61b165149a153abe5
Author: Jonathan Wakely <>
Date:   Wed Oct 30 16:03:01 2019 +0000

    Fix another compilation error with Clang
            * include/bits/stl_iterator.h (__normal_iterator::iterator_concept):
            Guard with __cpp_lib_concepts macro.

diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h
index ecc06178c34..411feba90e0 100644
--- a/libstdc++-v3/include/bits/stl_iterator.h
+++ b/libstdc++-v3/include/bits/stl_iterator.h
       typedef typename __traits_type::reference 	reference;
       typedef typename __traits_type::pointer   	pointer;
-#if __cplusplus > 201703L
+#if __cplusplus > 201703L && __cpp_lib_concepts
       using iterator_concept = std::__detail::__iter_concept<_Iterator>;

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]