aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@gcc.gnu.org>1999-01-18 16:42:34 -0500
committerJason Merrill <jason@gcc.gnu.org>1999-01-18 16:42:34 -0500
commitb661835c078788f95a01cb6c57e4bb444ee7a82d (patch)
tree24b6bba38a1e86b8ae6df893ce124a91453e6c77
parente6f622865f1be3f5db2d521ca2fb28165fd038a6 (diff)
downloadgcc-b661835c078788f95a01cb6c57e4bb444ee7a82d.zip
gcc-b661835c078788f95a01cb6c57e4bb444ee7a82d.tar.gz
gcc-b661835c078788f95a01cb6c57e4bb444ee7a82d.tar.bz2
update
From-SVN: r24751
-rw-r--r--gcc/testsuite/g++.old-deja/g++.jason/overload20.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.mike/p10769a.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.mike/pmf3.C6
-rw-r--r--gcc/testsuite/g++.old-deja/g++.pt/overload5.C2
4 files changed, 7 insertions, 7 deletions
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/overload20.C b/gcc/testsuite/g++.old-deja/g++.jason/overload20.C
index dde686c..998f6a7 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/overload20.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/overload20.C
@@ -3,8 +3,8 @@
void f (char *);
void f (int);
struct A {
- void f ();
- void f (int);
+ void f (); // ERROR - candidate
+ void f (int); // ERROR - candidate
void g () {
void (*p)(char *) = f; // ERROR - no matching function in scope
}
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p10769a.C b/gcc/testsuite/g++.old-deja/g++.mike/p10769a.C
index ae55c24..f5ff345 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p10769a.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p10769a.C
@@ -9,7 +9,7 @@ class A {
public:
void f1a() { ok += 3; }
void f1b() { ok += 5; }
- void f2a() { ok += 7; }
+ void f2a() { ok += 7; } // gets bogus error XFAIL *-*-*
void f2b() { }
const static void (*table[2][2])();
void main();
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/pmf3.C b/gcc/testsuite/g++.old-deja/g++.mike/pmf3.C
index 24753eb..b38f0b7 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/pmf3.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/pmf3.C
@@ -5,9 +5,9 @@ struct Fooey {
void h(double dx);
};
-void Fooey::f(char*) { }
-void Fooey::f(int) { }
-void Fooey::f(float) { }
+void Fooey::f(char*) { } // ERROR - candidate
+void Fooey::f(int) { } // ERROR - candidate
+void Fooey::f(float) { } // ERROR - candidate
void Fooey::h(double zahl) { }
int main() {
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/overload5.C b/gcc/testsuite/g++.old-deja/g++.pt/overload5.C
index 73bf535..058f4f4 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/overload5.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/overload5.C
@@ -1,6 +1,6 @@
// Build don't link:
-template <class T> void foo();
+template <class T> void foo(); // ERROR - candidate
void (*bar)() = foo<void>;
void (*baz)() = foo; // ERROR - can't deduce T