aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Oliva <oliva@dcc.unicamp.br>1998-12-04 12:57:50 +0000
committerAlexandre Oliva <oliva@gcc.gnu.org>1998-12-04 12:57:50 +0000
commit4dab1f3e9f46e25c08a6f73cfe18ac81865917f4 (patch)
tree1455f14a2f3a6a77806cf1ef702cde3d35acef8a
parentf62a15e367dd53a270f7766c5c62a82629478d3e (diff)
downloadgcc-4dab1f3e9f46e25c08a6f73cfe18ac81865917f4.zip
gcc-4dab1f3e9f46e25c08a6f73cfe18ac81865917f4.tar.gz
gcc-4dab1f3e9f46e25c08a6f73cfe18ac81865917f4.tar.bz2
using5.C: usified using[567].C here
* g++.old-deja/g++.other/using5.C: usified using[567].C here * g++.old-deja/g++.other/using6.C: removed * g++.old-deja/g++.other/using7.C: Mark Mitchel removed it From-SVN: r24091
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.other/using5.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.other/using6.C13
3 files changed, 7 insertions, 14 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 40b8f69..c68ef51 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
1998-12-04 Alexandre Oliva <oliva@dcc.unicamp.br>
+ * g++.old-deja/g++.other/using5.C: usified using[567].C here
+ * g++.old-deja/g++.other/using6.C: removed
+ * g++.old-deja/g++.other/using7.C: Mark Mitchel removed it
+
* g++.old-deja/g++.pt/spec20.C: Re-insert non-bogus ERROR marks.
1998-12-03 Alexandre Oliva <oliva@dcc.unicamp.br>
diff --git a/gcc/testsuite/g++.old-deja/g++.other/using5.C b/gcc/testsuite/g++.old-deja/g++.other/using5.C
index df610b2..57a9507 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/using5.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/using5.C
@@ -11,5 +11,7 @@ struct bar {
struct foo : bar {
using bar::t;
- void baz(t pos);
+ t field;
+ t meth();
+ void baz(t arg);
};
diff --git a/gcc/testsuite/g++.old-deja/g++.other/using6.C b/gcc/testsuite/g++.old-deja/g++.other/using6.C
deleted file mode 100644
index 31aa7cd..0000000
--- a/gcc/testsuite/g++.old-deja/g++.other/using6.C
+++ /dev/null
@@ -1,13 +0,0 @@
-// Build don't link:
-
-// Based on bug report by Klaus-Georg Adams
-// <Klaus-Georg.Adams@chemie.uni-karlsruhe.de>
-
-struct bar {
- typedef bar t;
-};
-
-struct foo : bar {
- using bar::t;
- t baz();
-};