diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2019-10-30 16:57:19 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2019-10-30 16:57:19 +0000 |
| commit | 411679568b2e3b1ca9b84673c430f2fdc9360368 (patch) | |
| tree | 3d461e46b6a89f4adae9b677609912460be9f18d | |
| parent | 0d58d88db68e190f9dfae241a806086872ef1d10 (diff) | |
| download | gcc-411679568b2e3b1ca9b84673c430f2fdc9360368.zip gcc-411679568b2e3b1ca9b84673c430f2fdc9360368.tar.gz gcc-411679568b2e3b1ca9b84673c430f2fdc9360368.tar.bz2 | |
Fix another compilation error with Clang
* include/bits/stl_iterator.h (__normal_iterator::iterator_concept):
Guard with __cpp_lib_concepts macro.
From-SVN: r277634
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_iterator.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 643c4ac..864c8aa 100644 --- 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 ecc0617..411feba 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 |