Remove unnecessary argument METHOD to valops.c:oload_method_static.

	* valops.c (oload_method_static): Remove unnecessary argument
	METHOD.  Update all callers.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cad4602b0c3308362a7d8503b8ee3a1992f451cf..21907fabd0a00d7214b03e0a33c67d7a6ef3733a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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>
            Tom Tromey  <tromey@redhat.com>
 

diff --git a/gdb/valops.c b/gdb/valops.c
index 7f2d5f05f01afa44dc76976425a0f4f732bc8135..ff25f1a67d933b934b9f7204734a945ef12c9513 100644 (file)
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -73,7 +73,7 @@ static int find_oload_champ (struct value **, int, int,
                             struct fn_field *, struct symbol **,
                             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 };
 
@@ -2488,8 +2488,8 @@ find_overload_match (struct value **args, int nargs,
 
          method_match_quality =
              classify_oload_match (method_badness, nargs,
-                                   oload_method_static (method, fns_ptr,
-                                                        method_oload_champ));
+                                   oload_method_static_p (fns_ptr,
+                                                          method_oload_champ));
 
          make_cleanup (xfree, method_badness);
        }
@@ -2637,7 +2637,7 @@ find_overload_match (struct value **args, int nargs,
     }
 
   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)
     {
@@ -2876,7 +2876,7 @@ find_oload_champ (struct value **args, int nargs,
       if (fns_ptr != NULL)
        {
          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
        {
@@ -2954,10 +2954,9 @@ find_oload_champ (struct value **args, int nargs,
    a non-static method or a function that isn't a method.  */
 
 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
-      && TYPE_FN_FIELD_STATIC_P (fns_ptr, index))
+  if (fns_ptr && index >= 0 && TYPE_FN_FIELD_STATIC_P (fns_ptr, index))
     return 1;
   else
     return 0;