diff options
| author | Jason Merrill <jason@redhat.com> | 2000-12-22 11:44:22 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2000-12-22 11:44:22 -0500 |
| commit | c939ca5f58d1bed64d68dd78f90f73122b814d6f (patch) | |
| tree | f6170dddb09ce80c9b7215b4e4a00ba3f63c65d2 /gcc | |
| parent | fe08a886b290a32453dd5ff084a2af073dd26968 (diff) | |
| download | gcc-c939ca5f58d1bed64d68dd78f90f73122b814d6f.zip gcc-c939ca5f58d1bed64d68dd78f90f73122b814d6f.tar.gz gcc-c939ca5f58d1bed64d68dd78f90f73122b814d6f.tar.bz2 | |
call.c (joust): Use DECL_NONSTATIC_MEMBER_FUNCTION_P, not DECL_STATIC_FUNCTION_P.
* call.c (joust): Use DECL_NONSTATIC_MEMBER_FUNCTION_P, not
DECL_STATIC_FUNCTION_P.
From-SVN: r38464
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/call.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a67f6bd..51fbec9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,10 @@ 2000-12-22 Jason Merrill <jason@redhat.com> + * call.c (joust): Use DECL_NONSTATIC_MEMBER_FUNCTION_P, not + DECL_STATIC_FUNCTION_P. + + * typeck.c (build_binary_op): Fix pmf comparison logic. + * semantics.c (genrtl_finish_function): Don't try to jump to return_label unless it exists. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 07d7268..c8aed73 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -5155,7 +5155,8 @@ joust (cand1, cand2, warn) winner = more_specialized (TI_TEMPLATE (cand1->template), TI_TEMPLATE (cand2->template), /* Never do unification on the 'this' parameter. */ - TREE_VEC_LENGTH (cand1->convs) - !DECL_STATIC_FUNCTION_P (cand1->fn)); + TREE_VEC_LENGTH (cand1->convs) + - DECL_NONSTATIC_MEMBER_FUNCTION_P (cand1->fn)); /* or, if not that, the context is an initialization by user-defined conversion (see |