Re: [C++ PATCH] Deprecate -ffriend-injection

[Nathan Sidwell]

On 02/16/2018 01:54 PM, Jason Merrill wrote:

My dejagnu doesn't like "cc1plus" as a line number:

ERROR: g++.old-deja/g++.jason/scoping15.C  -std=gnu++98: expected
integer but got "cc1plus:" for " dg-warning 25 "ffriend-injection.* is
deprecated" "" { target *-*-* } cc1plus: "

I think I got distracted halfway though editing that.  Fixed.

nathan
--
Nathan Sidwell

2018-02-16  Nathan Sidwell  <nat...@acm.org>

	* g++.old-deja/g++.jason/scoping15.C: Fix dg-warning.

Index: g++.old-deja/g++.jason/scoping15.C
===================================================================
--- g++.old-deja/g++.jason/scoping15.C	(revision 257742)
+++ g++.old-deja/g++.jason/scoping15.C	(working copy)
@@ -13,7 +13,7 @@ public:
 
 class FComplex {
 public:
-  friend  float    imag(const FComplex& a); // { dg-warning "is visible"
+  friend  float    imag(const FComplex& a); // { dg-warning "is visible" }
 };
 
 void
@@ -22,4 +22,4 @@ scnrm2(FComplex cx[])
   int imag;
   ::imag( cx[0] );
 }
-// { dg-warning "ffriend-injection.* is deprecated" "" { target *-*-* } cc1plus: }
+// { dg-warning "ffriend-injection.* is deprecated" "cc1plus:" { target *-*-* } 0 }