public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Aldy Hernandez <aldyh@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc/devel/ranger] libstdc++: Do not define __cpp_lib_constexpr_algorithms in <utility> Date: Wed, 17 Jun 2020 20:40:42 +0000 (GMT) [thread overview] Message-ID: <20200617204042.31D2A39A3019@sourceware.org> (raw) https://gcc.gnu.org/g:2025db692e9ed1192f831bc122413a226987515c commit 2025db692e9ed1192f831bc122413a226987515c Author: Jonathan Wakely <jwakely@redhat.com> Date: Wed Apr 22 22:54:35 2020 +0100 libstdc++: Do not define __cpp_lib_constexpr_algorithms in <utility> The C++20 draft and SD-6 both say this should only be in <version> and <algorithm>, not in <utility>. * include/std/utility (__cpp_lib_constexpr_algorithms): Do not define here. * testsuite/20_util/exchange/constexpr.cc: Do not expect macro to be defined by <utility>. Diff: --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/std/utility | 8 ++------ libstdc++-v3/testsuite/20_util/exchange/constexpr.cc | 6 ------ 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4e86ec188a5..4fec7b21029 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2020-04-22 Jonathan Wakely <jwakely@redhat.com> + * include/std/utility (__cpp_lib_constexpr_algorithms): Do not define + here. + * testsuite/20_util/exchange/constexpr.cc: Do not expect macro to be + defined by <utility>. + * include/std/functional (__cpp_lib_concepts): Update macro value to indicate P1964R2 support. * include/std/version (__cpp_lib_concepts): Likewise. diff --git a/libstdc++-v3/include/std/utility b/libstdc++-v3/include/std/utility index dc6e8468af5..5f1675a7679 100644 --- a/libstdc++-v3/include/std/utility +++ b/libstdc++-v3/include/std/utility @@ -238,7 +238,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION get(const std::pair<_Tp1, _Tp2>&& __in) noexcept { return __pair_get<_Int>::__const_move_get(std::move(__in)); } -#if __cplusplus > 201103L +#if __cplusplus >= 201402L #define __cpp_lib_tuples_by_type 201304 @@ -284,10 +284,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #define __cpp_lib_exchange_function 201304 -#if __cplusplus > 201703L -# define __cpp_lib_constexpr_algorithms 201806L -#endif - /// Assign @p __new_val to @p __obj and return its previous value. template <typename _Tp, typename _Up = _Tp> _GLIBCXX20_CONSTEXPR @@ -295,7 +291,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION exchange(_Tp& __obj, _Up&& __new_val) { return std::__exchange(__obj, std::forward<_Up>(__new_val)); } -#endif +#endif // C++14 // Stores a tuple of indices. Used by tuple and pair, and by bind() to // extract the elements in a tuple. diff --git a/libstdc++-v3/testsuite/20_util/exchange/constexpr.cc b/libstdc++-v3/testsuite/20_util/exchange/constexpr.cc index 3673772ea4b..ee6cbaebdee 100644 --- a/libstdc++-v3/testsuite/20_util/exchange/constexpr.cc +++ b/libstdc++-v3/testsuite/20_util/exchange/constexpr.cc @@ -20,12 +20,6 @@ #include <utility> -#ifndef __cpp_lib_constexpr_algorithms -# error "Feature-test macro for constexpr algorithms missing" -#elif __cpp_lib_constexpr_algorithms < 201806L -# error "Feature-test macro for constexpr algorithms has wrong value" -#endif - constexpr bool test() {
reply other threads:[~2020-06-17 20:40 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=20200617204042.31D2A39A3019@sourceware.org \ --to=aldyh@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).