From 4209417a70aba40a7acb50fedde7bb9e6df7ac30 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Fri, 12 Jul 2002 07:56:49 +0000 Subject: [PATCH] * class.c (add_method): Correct handling of conversion operators. From-SVN: r55420 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/class.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2e404daf06d0..9cf5b66e864e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2002-07-12 Mark Mitchell + + * class.c (add_method): Correct handling of conversion operators. + 2002-07-11 Mark Mitchell PR c++/7224 diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 7dd19503382a..998eec04a7c5 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -1006,7 +1006,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. */ -- 2.47.2