diff options
| author | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-07-12 07:56:49 +0000 |
|---|---|---|
| committer | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-07-12 07:56:49 +0000 |
| commit | 85abed0a5701f664cf14dbe392336e198b91f126 (patch) | |
| tree | 4492cbfe9238135f007817dea562747960d7de11 | |
| parent | fb8f049c821db4ca870ba7cb5166165ca640be70 (diff) | |
| download | gcc-85abed0a5701f664cf14dbe392336e198b91f126.tar.gz | |
* class.c (add_method): Correct handling of conversion operators.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-3_1-branch@55420 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/class.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2e404daf06d..9cf5b66e864 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 7dd19503382..998eec04a7c 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. */ |