Remove unnecessary argument METHOD to valops.c:oload_method_static.

* valops.c (oload_method_static): Remove unnecessary argument
	METHOD.  Update all callers.
This commit is contained in:
Siva Chandra 2014-03-03 05:08:47 -08:00
parent 13cfc86c87
commit 2bca57bacc
2 changed files with 12 additions and 8 deletions

View File

@ -1,3 +1,8 @@
2014-04-18 Siva Chandra Reddy <sivachandra@google.com>
* valops.c (oload_method_static): Remove unnecessary argument
METHOD. Update all callers.
2014-04-18 Pedro alves <palves@redhat.com> 2014-04-18 Pedro alves <palves@redhat.com>
Tom Tromey <tromey@redhat.com> Tom Tromey <tromey@redhat.com>

View File

@ -73,7 +73,7 @@ static int find_oload_champ (struct value **, int, int,
struct fn_field *, struct symbol **, struct fn_field *, struct symbol **,
struct badness_vector **); struct badness_vector **);
static int oload_method_static (int, struct fn_field *, int); static int oload_method_static_p (struct fn_field *, int);
enum oload_classification { STANDARD, NON_STANDARD, INCOMPATIBLE }; enum oload_classification { STANDARD, NON_STANDARD, INCOMPATIBLE };
@ -2488,8 +2488,8 @@ find_overload_match (struct value **args, int nargs,
method_match_quality = method_match_quality =
classify_oload_match (method_badness, nargs, classify_oload_match (method_badness, nargs,
oload_method_static (method, fns_ptr, oload_method_static_p (fns_ptr,
method_oload_champ)); method_oload_champ));
make_cleanup (xfree, method_badness); make_cleanup (xfree, method_badness);
} }
@ -2637,7 +2637,7 @@ find_overload_match (struct value **args, int nargs,
} }
if (staticp != NULL) if (staticp != NULL)
*staticp = oload_method_static (method, fns_ptr, method_oload_champ); *staticp = oload_method_static_p (fns_ptr, method_oload_champ);
if (method_oload_champ >= 0) if (method_oload_champ >= 0)
{ {
@ -2876,7 +2876,7 @@ find_oload_champ (struct value **args, int nargs,
if (fns_ptr != NULL) if (fns_ptr != NULL)
{ {
nparms = TYPE_NFIELDS (TYPE_FN_FIELD_TYPE (fns_ptr, ix)); nparms = TYPE_NFIELDS (TYPE_FN_FIELD_TYPE (fns_ptr, ix));
static_offset = oload_method_static (1, fns_ptr, ix); static_offset = oload_method_static_p (fns_ptr, ix);
} }
else else
{ {
@ -2954,10 +2954,9 @@ find_oload_champ (struct value **args, int nargs,
a non-static method or a function that isn't a method. */ a non-static method or a function that isn't a method. */
static int static int
oload_method_static (int method, struct fn_field *fns_ptr, int index) oload_method_static_p (struct fn_field *fns_ptr, int index)
{ {
if (method && fns_ptr && index >= 0 if (fns_ptr && index >= 0 && TYPE_FN_FIELD_STATIC_P (fns_ptr, index))
&& TYPE_FN_FIELD_STATIC_P (fns_ptr, index))
return 1; return 1;
else else
return 0; return 0;