Fix another compilation error with Clang

	* include/bits/stl_iterator.h (__normal_iterator::iterator_concept):
	Guard with __cpp_lib_concepts macro.

From-SVN: r277634

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 643c4ace0f723cf43c5b1ff6a56a8eac1a415f09..864c8aa81eb897152fafe12c8b1140651415983d 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 2019-10-30  Jonathan Wakely  <jwakely@redhat.com>
 
+       * include/bits/stl_iterator.h (__normal_iterator::iterator_concept):
+       Guard with __cpp_lib_concepts macro.
+
        * include/std/bit (__cpp_lib_bitops): Define.
        * include/std/version (__cpp_lib_constexpr): Remove.
        (__cpp_lib_bitops, __cpp_lib_constexpr_dynamic_alloc): Define.

diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h
index ecc06178c3489d8ffba9c871555dfff0f5dd9aa2..411feba90e05d101b26674e5c83967af61a4f4ff 100644 (file)
--- a/libstdc++-v3/include/bits/stl_iterator.h
+++ b/libstdc++-v3/include/bits/stl_iterator.h
@@ -809,7 +809,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       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>;
 #endif