From a942e89c9a5eb08a050d632d21ad12a1de25c65b Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@yorick.cygnus.com>
Date: Thu, 16 Jul 1998 15:02:05 +0000
Subject: * typeck.c (convert_for_assignment): Use comptypes.

From-SVN: r21216
---
 gcc/cp/ChangeLog | 4 ++++
 gcc/cp/typeck.c  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'gcc')

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;
-- 
cgit v1.1