From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 32F2C3858D1E; Thu, 3 Nov 2022 21:33:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 32F2C3858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667511226; bh=4Ap+RSJZF3Tw5hCJlFRUbhk/GirX44cRNDz0Do/vqTg=; h=From:To:Subject:Date:From; b=hcTcrfa57p6KN1aJqXqAuChI5J1fxb/wajWFtSjmSv8SaS+Juzz7mvOi88iIcew63 j8Hiy98IU08Ml6JLMNFU55GOzaHWatpIKykFK6JrJFuiHmSZeJL6C2FqAD5PUGbmIJ WDE+WEVFSGQSrY3q9wP6gL13sK59VGJnQiTpet/s= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jason Merrill To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc/devel/c++-contracts] comment tweaks X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/devel/c++-contracts X-Git-Oldrev: 7dbd1db4df283b73fe8e9c181d37a0754e429fac X-Git-Newrev: eaee89c99c02c59a3d21f615ac35a786e1b595d7 Message-Id: <20221103213346.32F2C3858D1E@sourceware.org> Date: Thu, 3 Nov 2022 21:33:46 +0000 (GMT) List-Id: https://gcc.gnu.org/g:eaee89c99c02c59a3d21f615ac35a786e1b595d7 commit eaee89c99c02c59a3d21f615ac35a786e1b595d7 Author: Jason Merrill 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 // . -// FIXME string_view vs. freestanding - /** @file contract * This is a Standard C++ Library header. */