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++: Make _GLIBCXX_CONCEPT_CHECKS more constexpr-friendly Date: Wed, 17 Jun 2020 19:14:35 +0000 (GMT) [thread overview] Message-ID: <20200617191435.DF0B939551F8@sourceware.org> (raw) https://gcc.gnu.org/g:eb8e6a30a442c4c12dc903d6e1817b223bbed4a3 commit eb8e6a30a442c4c12dc903d6e1817b223bbed4a3 Author: Jonathan Wakely <jwakely@redhat.com> Date: Thu Feb 27 10:52:28 2020 +0000 libstdc++: Make _GLIBCXX_CONCEPT_CHECKS more constexpr-friendly Although most of the old-style "concept checks" are only really usable with C++98 because they enforce the wrong things, this is a simple change that makes them a bit more useful for C++14 and up. * include/bits/boost_concept_check.h (__function_requires): Add _GLIBCXX14_CONSTEXPR. * testsuite/25_algorithms/min/concept_checks.cc: New test. Diff: --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/boost_concept_check.h | 2 +- .../testsuite/25_algorithms/min/concept_checks.cc | 23 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 49f2b59e3ae..0df7126f7c9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2020-02-27 Jonathan Wakely <jwakely@redhat.com> + + * include/bits/boost_concept_check.h (__function_requires): Add + _GLIBCXX14_CONSTEXPR. + * testsuite/25_algorithms/min/concept_checks.cc: New test. + 2020-02-26 Patrick Palka <ppalka@redhat.com> PR libstdc++/93936 diff --git a/libstdc++-v3/include/bits/boost_concept_check.h b/libstdc++-v3/include/bits/boost_concept_check.h index a555b3be568..f12c1bdc213 100644 --- a/libstdc++-v3/include/bits/boost_concept_check.h +++ b/libstdc++-v3/include/bits/boost_concept_check.h @@ -57,7 +57,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // as possible at runtime, use as few resources as possible, and hopefully // be elided out of existence... hmmm. template <class _Concept> -inline void __function_requires() +_GLIBCXX14_CONSTEXPR inline void __function_requires() { void (_Concept::*__x)() _IsUnused = &_Concept::__constraints; } diff --git a/libstdc++-v3/testsuite/25_algorithms/min/concept_checks.cc b/libstdc++-v3/testsuite/25_algorithms/min/concept_checks.cc new file mode 100644 index 00000000000..ba61ceff340 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/min/concept_checks.cc @@ -0,0 +1,23 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +// { dg-do compile { target c++14 } } + +#define _GLIBCXX_CONCEPT_CHECKS 1 +#include <algorithm> + +constexpr int i = std::min(1, 2);
reply other threads:[~2020-06-17 19:14 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=20200617191435.DF0B939551F8@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).