Merge from mainlinebefore_gc_merge_990902egcs_gc_branch

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/egcs_gc_branch@26036 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 3 insertions, 19 deletions

diff --git a/gcc/testsuite/g++.old-deja/g++.mike/pmf3.C b/gcc/testsuite/g++.old-deja/g++.mike/pmf3.C
index 24753eb1f9a..76fa1ef28e1 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/pmf3.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/pmf3.C
@@ -1,19 +1,3 @@
-struct Fooey {
-  void f(char* pX);
-  void f(int in);
-  void f(float fx);
-  void h(double dx);
-};
-
-void Fooey::f(char*) { }
-void Fooey::f(int) { }
-void Fooey::f(float) { }
-void Fooey::h(double zahl) { }
-
-int main() {
-  Fooey Blah;
-  void (Fooey::*pointer)(double);
-  pointer = &Fooey::f;		// ERROR - don't call Fooey::h
-  (Blah.*pointer)(42.5);
-  return 0;
-}
+void Fooey::f(char*) { }	// ERROR - candidate
+void Fooey::f(int) { }		// ERROR - candidate
+void Fooey::f(float) { }	// ERROR - candidate