aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@yorick.cygnus.com>1998-07-16 15:02:05 +0000
committerJason Merrill <jason@gcc.gnu.org>1998-07-16 11:02:05 -0400
commita942e89c9a5eb08a050d632d21ad12a1de25c65b (patch)
treed9405e2e8c366c7ed171bce9b505c8cb923995e3 /gcc
parent6673b2ea6abee53ec23b92fdb76452b8c37b0c52 (diff)
downloadgcc-a942e89c9a5eb08a050d632d21ad12a1de25c65b.zip
gcc-a942e89c9a5eb08a050d632d21ad12a1de25c65b.tar.gz
gcc-a942e89c9a5eb08a050d632d21ad12a1de25c65b.tar.bz2
* typeck.c (convert_for_assignment): Use comptypes.
From-SVN: r21216
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/typeck.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 08b57eb..749bf21 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+1998-07-16 Jason Merrill <jason@yorick.cygnus.com>
+
+ * typeck.c (convert_for_assignment): Use comptypes.
+
1998-07-16 Mark Mitchell <mark@markmitchell.com>
* semantics.c (finish_object_call_expr): Move test for the
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 7ac9cf1..644260a 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -6622,7 +6622,7 @@ convert_for_assignment (type, rhs, errtype, fndecl, parmnum)
else if (TREE_READONLY_DECL_P (rhs))
rhs = decl_constant_value (rhs);
- if (type == rhstype)
+ if (comptypes (type, rhstype, 1))
{
overflow_warning (rhs);
return rhs;