diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2002-07-12 07:55:16 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2002-07-12 07:55:16 +0000 |
| commit | 04ec0065dc10346e670c8972cb63a7c4f3dd4993 (patch) | |
| tree | c963fa94642006867fadc517340990f03ab3df38 | |
| parent | 5a363fc83e22ef3822d1959bab8077360d17815b (diff) | |
| download | gcc-04ec0065dc10346e670c8972cb63a7c4f3dd4993.zip gcc-04ec0065dc10346e670c8972cb63a7c4f3dd4993.tar.gz gcc-04ec0065dc10346e670c8972cb63a7c4f3dd4993.tar.bz2 | |
* class.c (add_method): Correct handling of conversion operators.
From-SVN: r55419
| -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 38de1a2..e2e1836 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 5222665..b59c7ce 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. */ |