From 0d7e147bb3be3e686f2df91104cff82bdf5029df Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Sun, 17 May 1998 21:53:57 -0400 Subject: [PATCH] update From-SVN: r19830 --- gcc/testsuite/g++.old-deja/g++.other/redecl1.C | 4 ++-- gcc/testsuite/g++.old-deja/g++.other/using2.C | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/testsuite/g++.old-deja/g++.other/redecl1.C b/gcc/testsuite/g++.old-deja/g++.other/redecl1.C index 6e25a9aca39..d08e5aa9088 100644 --- a/gcc/testsuite/g++.old-deja/g++.other/redecl1.C +++ b/gcc/testsuite/g++.old-deja/g++.other/redecl1.C @@ -1,6 +1,6 @@ //Build don't link: struct X{ - void i(); // ERROR - - void i(int); + void i(); + void i(int); // ERROR - int i; // ERROR - conflict }; diff --git a/gcc/testsuite/g++.old-deja/g++.other/using2.C b/gcc/testsuite/g++.old-deja/g++.other/using2.C index 41887c4097e..2924498e35a 100644 --- a/gcc/testsuite/g++.old-deja/g++.other/using2.C +++ b/gcc/testsuite/g++.old-deja/g++.other/using2.C @@ -5,6 +5,6 @@ struct X{ struct Y:X{ void f(int); - void f(); - using X::f; // ERROR - conflict -}; // ERROR - + void f(); // ERROR - conflict + using X::f; +}; // ERROR - -- 2.30.2