From: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 29 Oct 2019 20:17:02 +0000 (+0000)
Subject: Fix compilation errors with Clang
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6de714e3168090267096b7853c6ce891d4a8d2ee;p=thirdparty%2Fgcc.git

Fix compilation errors with Clang

	* include/bits/range_access.h (ranges::disable_sized_range)
	(ranges::begin, ranges::end, ranges::cbegin, ranges::cend)
	(ranges::rbegin, ranges::rend, ranges::crbegin, ranges::crend)
	(ranges::size, ranges::empty, ranges::data, ranges::cdata)
	(ranges::range, ranges::sized_range, ranges::advance, ranges::distance)
	(ranges::next, ranges::prev): Guard with __cpp_lib_concepts.
	* include/bits/stl_iterator.h (disable_sized_sentinel): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@277589 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e9908841420b..11cce3517bc8 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,13 @@
 2019-10-29  Jonathan Wakely  <jwakely@redhat.com>
 
+	* include/bits/range_access.h (ranges::disable_sized_range)
+	(ranges::begin, ranges::end, ranges::cbegin, ranges::cend)
+	(ranges::rbegin, ranges::rend, ranges::crbegin, ranges::crend)
+	(ranges::size, ranges::empty, ranges::data, ranges::cdata)
+	(ranges::range, ranges::sized_range, ranges::advance, ranges::distance)
+	(ranges::next, ranges::prev): Guard with __cpp_lib_concepts.
+	* include/bits/stl_iterator.h (disable_sized_sentinel): Likewise.
+
 	* include/bits/alloc_traits.h (__cpp_lib_constexpr_dynamic_alloc):
 	Define.
 	(allocator_traits::_S_construct, allocator_traits::_S_destroy)
diff --git a/libstdc++-v3/include/bits/range_access.h b/libstdc++-v3/include/bits/range_access.h
index 3b6ed9aa66a3..9c8bef6b3a19 100644
--- a/libstdc++-v3/include/bits/range_access.h
+++ b/libstdc++-v3/include/bits/range_access.h
@@ -349,6 +349,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     __adl_data(_Container& __cont) noexcept(noexcept(data(__cont)))
     { return data(__cont); }
 
+#ifdef __cpp_lib_concepts
 namespace ranges
 {
   template<typename>
@@ -1061,6 +1062,7 @@ namespace ranges
     }
 
 } // namespace ranges
+#endif // library concepts
 #endif // C++20
 _GLIBCXX_END_NAMESPACE_VERSION
 } // namespace
diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h
index 966087598f4a..c10117e9b381 100644
--- a/libstdc++-v3/include/bits/stl_iterator.h
+++ b/libstdc++-v3/include/bits/stl_iterator.h
@@ -442,7 +442,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     make_reverse_iterator(_Iterator __i)
     { return reverse_iterator<_Iterator>(__i); }
 
-#  if __cplusplus > 201703L
+#  if __cplusplus > 201703L && defined __cpp_lib_concepts
   template<typename _Iterator1, typename _Iterator2>
     requires (!sized_sentinel_for<_Iterator1, _Iterator2>)
     inline constexpr bool disable_sized_sentinel<reverse_iterator<_Iterator1>,