diff options
| author | Jason Merrill <jason@gcc.gnu.org> | 1998-05-17 21:53:57 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1998-05-17 21:53:57 -0400 |
| commit | 0d7e147bb3be3e686f2df91104cff82bdf5029df (patch) | |
| tree | b489676ff74fb4eab29d162977e12dd0aec8da33 | |
| parent | 95480b77a28056956966246a8bb709018f6e09f6 (diff) | |
| download | gcc-0d7e147bb3be3e686f2df91104cff82bdf5029df.zip gcc-0d7e147bb3be3e686f2df91104cff82bdf5029df.tar.gz gcc-0d7e147bb3be3e686f2df91104cff82bdf5029df.tar.bz2 | |
update
From-SVN: r19830
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.other/redecl1.C | 4 | ||||
| -rw-r--r-- | 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 6e25a9a..d08e5aa 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 41887c4..2924498 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 - |