aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorNathan Sidwell <nathan@codesourcery.com>2000-08-17 14:09:21 +0000
committerNathan Sidwell <nathan@gcc.gnu.org>2000-08-17 14:09:21 +0000
commitf1819d9a3dac73292ed482a98a28311fce84c4f9 (patch)
tree272bc19d82ca0385c0261a61bdf8f1db96a4da1e /gcc
parent105d8e1f6eb32ba2199548f2f6b0a01d92bd3201 (diff)
downloadgcc-f1819d9a3dac73292ed482a98a28311fce84c4f9.zip
gcc-f1819d9a3dac73292ed482a98a28311fce84c4f9.tar.gz
gcc-f1819d9a3dac73292ed482a98a28311fce84c4f9.tar.bz2
cvt.c (cp_convert_to_pointer): Pass itf_complain, not itf_no_attributes.
* cvt.c (cp_convert_to_pointer): Pass itf_complain, not itf_no_attributes. From-SVN: r35759
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog3
-rw-r--r--gcc/cp/cvt.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 98db77a..ef5b4cb 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -2,6 +2,9 @@
* class.c (instantiate_type): Reinstate local variable
deleted in previous change.
+
+ * cvt.c (cp_convert_to_pointer): Pass itf_complain, not
+ itf_no_attributes.
2000-08-17 Nathan Sidwell <nathan@codesourcery.com>
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index 77e7ae8..606f854 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -267,7 +267,7 @@ cp_convert_to_pointer (type, expr)
}
if (type_unknown_p (expr))
- return instantiate_type (type, expr, itf_no_attributes);
+ return instantiate_type (type, expr, itf_complain);
cp_error ("cannot convert `%E' from type `%T' to type `%T'",
expr, intype, type);