From: François Dumont <fdumont@gcc.gnu.org>
Date: Tue, 26 Nov 2019 06:07:23 +0000 (+0000)
Subject: libstdc++: Add _GLIBCXX_DEBUG safe iterator C++20 iterator concept
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=db58c8e919e0045052e481db426304986bac3cd9;p=gcc.git

libstdc++: Add _GLIBCXX_DEBUG safe iterator C++20 iterator concept

	* include/debug/safe_iterator.h
	[__cpp_lib_concepts](_Safe_iterator<>::iterator_concept): Define for
	C++20.

From-SVN: r278717
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4ea06a37a1f..986ac2a00c6 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2019-11-26  François Dumont  <fdumont@gcc.gnu.org>
+
+	* include/debug/safe_iterator.h
+	[__cpp_lib_concepts](_Safe_iterator<>::iterator_concept): Define for
+	C++20.
+
 2019-11-25  Jonathan Wakely  <jwakely@redhat.com>
 
 	* include/bits/iterator_concepts.h (ranges::iter_swap): Fix parameter
diff --git a/libstdc++-v3/include/debug/safe_iterator.h b/libstdc++-v3/include/debug/safe_iterator.h
index 6700eafca0b..fa0d03f39dc 100644
--- a/libstdc++-v3/include/debug/safe_iterator.h
+++ b/libstdc++-v3/include/debug/safe_iterator.h
@@ -140,6 +140,10 @@ namespace __gnu_debug
       typedef typename _Traits::reference		reference;
       typedef typename _Traits::pointer			pointer;
 
+#if __cplusplus > 201703L && __cpp_lib_concepts
+      using iterator_concept = std::__detail::__iter_concept<_Iterator>;
+#endif
+
       /// @post the iterator is singular and unattached
       _Safe_iterator() _GLIBCXX_NOEXCEPT : _Iter_base() { }