aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMark Mitchell <mark@markmitchell.com>1998-12-10 13:35:36 +0000
committerMark Mitchell <mmitchel@gcc.gnu.org>1998-12-10 13:35:36 +0000
commit513e9d13b4619d6ee88fce6f59d24962951e6f71 (patch)
tree777ba98a8f4f2888d1ea3a13f13a6648723258eb /gcc
parent353f10d599e12e831b1f51baee31d06613165144 (diff)
downloadgcc-513e9d13b4619d6ee88fce6f59d24962951e6f71.zip
gcc-513e9d13b4619d6ee88fce6f59d24962951e6f71.tar.gz
gcc-513e9d13b4619d6ee88fce6f59d24962951e6f71.tar.bz2
class.c (instantiate_type): Return error_mark_node rather than junk.
* class.c (instantiate_type): Return error_mark_node rather than junk. From-SVN: r24240
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/class.c1
-rw-r--r--gcc/testsuite/g++.old-deja/g++.robertl/eb131.C2
3 files changed, 7 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cf09c64..5348e3b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+1998-12-10 Mark Mitchell <mark@markmitchell.com>
+
+ * class.c (instantiate_type): Return error_mark_node rather than
+ junk.
+
1998-12-09 Mark Mitchell <mark@markmitchell.com>
* cp-tree.h (most_specialized_instantiation): New function.
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 806ba62..46d162e 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -5304,6 +5304,7 @@ instantiate_type (lhstype, rhs, complain)
function);
cp_error (" to form a pointer to member function, say `&%T::%D'",
t, DECL_NAME (function));
+ return error_mark_node;
}
mark_used (function);
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb131.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb131.C
index f0f7feb..d966fd9 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb131.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb131.C
@@ -10,7 +10,7 @@ struct a {
void bar( double );
void bar( float );
- void foo( void (a::*member)(float) );
+ void foo( void (a::*member)(float) ); // ERROR - candidate
};
a::a()