* class.c (add_method): Correct handling of conversion operators.

From-SVN: r55419

* class.c (add_method): Correct handling of conversion operators.
From-SVN: r55419
04ec0065 · Mark Mitchell · Mark Mitchell · 5a363fc8 · 04ec0065 · 04ec0065
Commit 04ec0065 authored Jul 12, 2002 by Mark Mitchell Committed by Mark Mitchell Jul 12, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletions

gcc/cp/ChangeLog
+4 -0

gcc/cp/class.c
+4 -1

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
+2002-07-12  Mark Mitchell  <mark@codesourcery.com>
+
+	* class.c (add_method): Correct handling of conversion operators.
+
 2002-07-11  Mark Mitchell  <mark@codesourcery.com>

 	PR c++/7224

--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -999,7 +999,10 @@ add_method (type, method, error_p)
 	  if (! DECL_STATIC_FUNCTION_P (method))
 	    parms2 = TREE_CHAIN (parms2);

-	  if (same && compparms (parms1, parms2))
+	  if (same && compparms (parms1, parms2) 
+	      && (!DECL_CONV_FN_P (fn) 
+		  || same_type_p (TREE_TYPE (TREE_TYPE (fn)),
+				  TREE_TYPE (TREE_TYPE (method)))))
 	    {
 	      if (using && DECL_CONTEXT (fn) == type)
 		/* Defer to the local function.  */