From: Mark Mitchell <mark@codesourcery.com>
Date: Fri, 12 Jul 2002 07:55:16 +0000 (+0000)
Subject: * class.c (add_method): Correct handling of conversion operators.
X-Git-Tag: releases/gcc-3.3.0~3854
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04ec0065dc10346e670c8972cb63a7c4f3dd4993;p=thirdparty%2Fgcc.git

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

From-SVN: r55419
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 38de1a298e58..e2e1836a235e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+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
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 5222665f7bdf..b59c7ce22ea0 100644
--- 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.  */