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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a67f6bda574e8071ef682eb68aca9b7cffcf64d7..51fbec9b4f4d14327d020d73dcc43bea0e2d3e5b 100644 (file)
--- 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 07d7268bd7bec85aa15b5d57f8f5d7a4b4a43ad6..c8aed738036ccecae31b63e1b8ebc2f8ec98a0a8 100644 (file)
--- 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