public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Tamar Christina <tnfchris@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/ARM/heads/arm-perf-staging)] libstdc++: Fix compilation with released versions of Clang Date: Fri, 17 Jul 2020 13:56:45 +0000 (GMT) [thread overview] Message-ID: <20200717135645.5510039B0432@sourceware.org> (raw) https://gcc.gnu.org/g:07522ae90b5bae2ca95b64f3a4de60bea0cc0567 commit 07522ae90b5bae2ca95b64f3a4de60bea0cc0567 Author: Jonathan Wakely <jwakely@redhat.com> Date: Wed Mar 18 12:55:29 2020 +0000 libstdc++: Fix compilation with released versions of Clang Clang 9 supports C++20 via -std=c++2a but doesn't support Concepts, so several of the new additions related to the Ranges library fail to compile with -std=c++2a. The new definition of iterator_traits and the definition of default_sentinel_t are guarded by __cpp_lib_concepts, so check that in addition to __cplusplus > 201703L. * include/bits/stl_algobase.h (__lexicographical_compare_aux): Check __cpp_lib_concepts before using iter_reference_t. * include/bits/stream_iterator.h (istream_iterator): Check __cpp_lib_concepts before using default_sentinel_t. * include/bits/streambuf_iterator.h (istreambuf_iterator): Likewise. Diff: --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/stl_algobase.h | 2 +- libstdc++-v3/include/bits/stream_iterator.h | 4 ++-- libstdc++-v3/include/bits/streambuf_iterator.h | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b874bb25b9e..ae5fedbc66b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 2020-03-18 Jonathan Wakely <jwakely@redhat.com> + * include/bits/stl_algobase.h (__lexicographical_compare_aux): Check + __cpp_lib_concepts before using iter_reference_t. + * include/bits/stream_iterator.h (istream_iterator): Check + __cpp_lib_concepts before using default_sentinel_t. + * include/bits/streambuf_iterator.h (istreambuf_iterator): Likewise. + PR libstdc++/94203 * include/experimental/executor (executor::executor(Executor)): Call make_shared directly instead of _M_create. Create _Tgt1 object. diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index 8f3ca885f03..a7e92d4b473 100644 --- a/libstdc++-v3/include/bits/stl_algobase.h +++ b/libstdc++-v3/include/bits/stl_algobase.h @@ -1283,7 +1283,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER && !__gnu_cxx::__numeric_traits<_ValueType2>::__is_signed && __is_pointer<_II1>::__value && __is_pointer<_II2>::__value -#if __cplusplus > 201703L +#if __cplusplus > 201703L && __cpp_lib_concepts // For C++20 iterator_traits<volatile T*>::value_type is non-volatile // so __is_byte<T> could be true, but we can't use memcmp with // volatile data. diff --git a/libstdc++-v3/include/bits/stream_iterator.h b/libstdc++-v3/include/bits/stream_iterator.h index 9d8ead092b8..bd5ba2a80c0 100644 --- a/libstdc++-v3/include/bits/stream_iterator.h +++ b/libstdc++-v3/include/bits/stream_iterator.h @@ -77,7 +77,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_ok(__obj._M_ok) { } -#if __cplusplus > 201703L +#if __cplusplus > 201703L && __cpp_lib_concepts constexpr istream_iterator(default_sentinel_t) noexcept(is_nothrow_default_constructible_v<_Tp>) @@ -153,7 +153,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator!=(const istream_iterator& __x, const istream_iterator& __y) { return !__x._M_equal(__y); } -#if __cplusplus > 201703L +#if __cplusplus > 201703L && __cpp_lib_concepts friend bool operator==(const istream_iterator& __i, default_sentinel_t) { return !__i._M_stream; } diff --git a/libstdc++-v3/include/bits/streambuf_iterator.h b/libstdc++-v3/include/bits/streambuf_iterator.h index fc06c50040c..d3f1610fc8d 100644 --- a/libstdc++-v3/include/bits/streambuf_iterator.h +++ b/libstdc++-v3/include/bits/streambuf_iterator.h @@ -115,7 +115,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_CONSTEXPR istreambuf_iterator() _GLIBCXX_USE_NOEXCEPT : _M_sbuf(0), _M_c(traits_type::eof()) { } -#if __cplusplus > 201703L +#if __cplusplus > 201703L && __cpp_lib_concepts constexpr istreambuf_iterator(default_sentinel_t) noexcept : istreambuf_iterator() { } #endif @@ -215,7 +215,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return traits_type::eq_int_type(__c, __eof); } -#if __cplusplus > 201703L +#if __cplusplus > 201703L && __cpp_lib_concepts friend bool operator==(const istreambuf_iterator& __i, default_sentinel_t __s) { return __i._M_at_eof(); }
reply other threads:[~2020-07-17 13:56 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200717135645.5510039B0432@sourceware.org \ --to=tnfchris@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).