From: Jason Merrill <jason@redhat.com>
Date: Thu, 3 Nov 2022 19:59:38 +0000 (-0400)
Subject: comment tweaks
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaee89c99c02c59a3d21f615ac35a786e1b595d7;p=thirdparty%2Fgcc.git

comment tweaks
---

diff --git a/gcc/testsuite/g++.dg/contracts/contracts-nested-class1.C b/gcc/testsuite/g++.dg/contracts/contracts-nested-class1.C
index 05c1cf131c44..9f91ff499d01 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 a9ac7fc60de3..70c9259049fa 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 16f3fd5fd5a2..2fa8ecf53f6f 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 a1c2f62a5188..66f4532c7070 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.
 ##