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

gcc/cp/ChangeLog

 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.
 

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