public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Jason Merrill <jason@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc/devel/c++-contracts] comment tweaks Date: Thu, 3 Nov 2022 21:33:46 +0000 (GMT) [thread overview] Message-ID: <20221103213346.32F2C3858D1E@sourceware.org> (raw) https://gcc.gnu.org/g:eaee89c99c02c59a3d21f615ac35a786e1b595d7 commit eaee89c99c02c59a3d21f615ac35a786e1b595d7 Author: Jason Merrill <jason@redhat.com> Date: Thu Nov 3 15:59:38 2022 -0400 comment tweaks Diff: --- gcc/testsuite/g++.dg/contracts/contracts-nested-class1.C | 3 --- gcc/testsuite/g++.dg/contracts/contracts-redecl2.C | 1 - libstdc++-v3/src/experimental/Makefile.am | 2 +- libstdc++-v3/include/experimental/contract | 2 -- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/gcc/testsuite/g++.dg/contracts/contracts-nested-class1.C b/gcc/testsuite/g++.dg/contracts/contracts-nested-class1.C index 05c1cf131c4..9f91ff499d0 100644 --- a/gcc/testsuite/g++.dg/contracts/contracts-nested-class1.C +++ b/gcc/testsuite/g++.dg/contracts/contracts-nested-class1.C @@ -12,9 +12,6 @@ struct Outer { void fn(int m) [[ pre: m > 1 ]]; friend void Inner::fn(int n) [[ pre: n > 0 && bob > 1 ]]; // { dg-error "not declared" } - // FIXME: These functions are merged together with no diagnostic. We get an - // error about 'p' not being declared because the contracts haven't been - // unified or remapped. friend void gfn(int p) [[ pre: p > 0 ]]; friend void gfn(int q) [[ pre: q > 1 ]]; // { dg-error "'q' was not declared" } diff --git a/gcc/testsuite/g++.dg/contracts/contracts-redecl2.C b/gcc/testsuite/g++.dg/contracts/contracts-redecl2.C index a9ac7fc60de..70c9259049f 100644 --- a/gcc/testsuite/g++.dg/contracts/contracts-redecl2.C +++ b/gcc/testsuite/g++.dg/contracts/contracts-redecl2.C @@ -1,5 +1,4 @@ // generic error tests for generalized contract redecls -// FIXME: merge into contracts-redecl1 // { dg-do compile } // { dg-options "-std=c++2a -fcontracts" } diff --git a/libstdc++-v3/src/experimental/Makefile.am b/libstdc++-v3/src/experimental/Makefile.am index a1c2f62a518..66f4532c707 100644 --- a/libstdc++-v3/src/experimental/Makefile.am +++ b/libstdc++-v3/src/experimental/Makefile.am @@ -1,4 +1,4 @@ -## Makefile for the GNU C++ Filesystem library. +## Makefile for experimental additions to the GNU C++ Standard library. ## ## Copyright (C) 2014-2022 Free Software Foundation, Inc. ## diff --git a/libstdc++-v3/include/experimental/contract b/libstdc++-v3/include/experimental/contract index 16f3fd5fd5a..2fa8ecf53f6 100644 --- a/libstdc++-v3/include/experimental/contract +++ b/libstdc++-v3/include/experimental/contract @@ -23,8 +23,6 @@ // see the files COPYING3 and COPYING.RUNTIME respectively. If not, see // <http://www.gnu.org/licenses/>. -// FIXME string_view vs. freestanding - /** @file contract * This is a Standard C++ Library header. */
reply other threads:[~2022-11-03 21:33 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=20221103213346.32F2C3858D1E@sourceware.org \ --to=jason@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).