diff options
| author | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-05-30 17:39:59 +0000 |
|---|---|---|
| committer | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-05-30 17:39:59 +0000 |
| commit | 86720eb23303de52b0345b582b0121093a93d04b (patch) | |
| tree | 21f6a519f101726787f41ec3d6ab7c7bc260d528 /gcc/cp | |
| parent | a528d77b63372675f259ce1c0561483380f00754 (diff) | |
| download | ppe42-gcc-86720eb23303de52b0345b582b0121093a93d04b.tar.gz ppe42-gcc-86720eb23303de52b0345b582b0121093a93d04b.zip | |
* call.c (joust): Fix handling of overloaded builtin operators.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34269 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/call.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e7f8552f7ed..e6cdcd2c9ba 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2000-05-30 Mark Mitchell <mark@codesourcery.com> + + * call.c (joust): Fix handling of overloaded builtin operators. + 2000-05-30 Zack Weinberg <zack@wolery.cumb.org> * cp-tree.h (DECL_ANTICIPATED): New macro. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 2bd5c81843a..acb5cfeced3 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -5128,7 +5128,7 @@ joust (cand1, cand2, warn) /* Kludge around broken overloading rules whereby Integer a, b; test ? a : b; is ambiguous, since there's a builtin that takes references and another that takes values. */ - if (DECL_OVERLOADED_OPERATOR_P (cand1->fn) == COND_EXPR) + if (cand1->fn == ansi_opname (COND_EXPR)) { tree c1 = TREE_VEC_ELT (cand1->convs, 1); tree c2 = TREE_VEC_ELT (cand2->convs, 1); |
