From 411679568b2e3b1ca9b84673c430f2fdc9360368 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 30 Oct 2019 16:57:19 +0000 Subject: [PATCH] Fix another compilation error with Clang * include/bits/stl_iterator.h (__normal_iterator::iterator_concept): Guard with __cpp_lib_concepts macro. From-SVN: r277634 --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/include/bits/stl_iterator.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 643c4ace0f7..864c8aa81eb 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2019-10-30 Jonathan Wakely + * 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 ecc06178c34..411feba90e0 100644 --- 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 -- 2.30.2