public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r12-3173] libstdc++: Add static assertions for std::function requirements
Date: Thu, 26 Aug 2021 23:13:04 +0000 (GMT)	[thread overview]
Message-ID: <20210826231304.764A5385842B@sourceware.org> (raw)

https://gcc.gnu.org/g:8cf428bfd3ca967b3d135e311d3e391998a39335

commit r12-3173-g8cf428bfd3ca967b3d135e311d3e391998a39335
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Thu Aug 26 13:13:27 2021 +0100

    libstdc++: Add static assertions for std::function requirements
    
    Add static assertions to std::function, so that more user-friendly
    diagnostics are given when trying to store a non-copyable target object.
    
    These preconditions were added as "Mandates:" by LWG 2447, but I'm
    committing them separately from implementing that, to allow just this
    change to be backported more easily.
    
    Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
    
    libstdc++-v3/ChangeLog:
    
            * include/bits/std_function.h (function::function(F)): Add
            static assertions to check constructibility requirements.

Diff:
---
 libstdc++-v3/include/bits/std_function.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libstdc++-v3/include/bits/std_function.h b/libstdc++-v3/include/bits/std_function.h
index fb86ff1c5f8..e081cd81ef4 100644
--- a/libstdc++-v3/include/bits/std_function.h
+++ b/libstdc++-v3/include/bits/std_function.h
@@ -422,6 +422,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	function(_Functor __f)
 	: _Function_base()
 	{
+	  static_assert(is_copy_constructible<_Functor>::value,
+	      "std::function target must be copy-constructible");
+	  static_assert(is_constructible<_Functor, _Functor>::value,
+	      "std::function target must be constructible from the "
+	      "constructor argument");
+
 	  using _My_handler = _Function_handler<_Res(_ArgTypes...), _Functor>;
 
 	  if (_My_handler::_M_not_empty_function(__f))


                 reply	other threads:[~2021-08-26 23:13 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=20210826231304.764A5385842B@sourceware.org \
    --to=redi@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: link
Be 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).