aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2022-11-03 15:59:38 -0400
committerJason Merrill <jason@redhat.com>2022-11-03 17:33:27 -0400
commiteaee89c99c02c59a3d21f615ac35a786e1b595d7 (patch)
tree754912da8805a421a121622807650c77e5cdc3d5
parent7dbd1db4df283b73fe8e9c181d37a0754e429fac (diff)
downloadgcc-eaee89c99c02c59a3d21f615ac35a786e1b595d7.zip
gcc-eaee89c99c02c59a3d21f615ac35a786e1b595d7.tar.gz
gcc-eaee89c99c02c59a3d21f615ac35a786e1b595d7.tar.bz2
comment tweaks
-rw-r--r--gcc/testsuite/g++.dg/contracts/contracts-nested-class1.C3
-rw-r--r--gcc/testsuite/g++.dg/contracts/contracts-redecl2.C1
-rw-r--r--libstdc++-v3/include/experimental/contract2
-rw-r--r--libstdc++-v3/src/experimental/Makefile.am2
4 files changed, 1 insertions, 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 05c1cf1..9f91ff4 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 a9ac7fc60d..70c9259 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/include/experimental/contract b/libstdc++-v3/include/experimental/contract
index 16f3fd5..2fa8ecf 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.
*/
diff --git a/libstdc++-v3/src/experimental/Makefile.am b/libstdc++-v3/src/experimental/Makefile.am
index a1c2f62..66f4532 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.
##