From 28c64fc2c0e1232b1c2b962139ca11e690e7633c Mon Sep 17 00:00:00 2001 From: Siva Chandra Reddy Date: Fri, 25 Jan 2013 22:31:43 +0000 Subject: [PATCH] * valops.c (find_overload_match): Remove unused argument 'lax'. * value.h: Remove unused argument 'lax' from the declaration of find_overload_match. * eval.c (value_subexp_standard): Do not pass a 'lax' argument to find_overload_match. * valarith.c (value_user_defined_cpp_op): Do not pass a 'lax' argument to find_overload_match. --- gdb/ChangeLog | 10 ++++++++++ gdb/eval.c | 3 --- gdb/valarith.c | 2 +- gdb/valops.c | 10 ++++------ gdb/value.h | 2 +- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d9377ccf31b..1b04f690aab 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2013-01-25 Siva Chandra Reddy + + * valops.c (find_overload_match): Remove unused argument 'lax'. + * value.h: Remove unused argument 'lax' from the declaration of + find_overload_match. + * eval.c (value_subexp_standard): Do not pass a 'lax' argument + to find_overload_match. + * valarith.c (value_user_defined_cpp_op): Do not pass a 'lax' + argument to find_overload_match. + 2013-01-25 Tom Tromey * dwarf2read.c (processing_has_namespace_info): Remove. diff --git a/gdb/eval.c b/gdb/eval.c index c9630df1ebd..f4b39cbc2b0 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1590,7 +1590,6 @@ evaluate_subexp_standard (struct type *expect_type, find_overload_match (&argvec[1], nargs, func_name, NON_METHOD, /* not method */ - 0, /* strict match */ NULL, NULL, /* pass NULL symbol since symbol is unknown */ NULL, &symp, NULL, 0); @@ -1626,7 +1625,6 @@ evaluate_subexp_standard (struct type *expect_type, (void) find_overload_match (&argvec[1], nargs, tstr, METHOD, /* method */ - 0, /* strict match */ &arg2, /* the object */ NULL, &valp, NULL, &static_memfuncp, 0); @@ -1698,7 +1696,6 @@ evaluate_subexp_standard (struct type *expect_type, (void) find_overload_match (&argvec[1], nargs, NULL, /* no need for name */ NON_METHOD, /* not method */ - 0, /* strict match */ NULL, function, /* the function */ NULL, &symp, NULL, no_adl); diff --git a/gdb/valarith.c b/gdb/valarith.c index 894a87ac048..bdc98fffe31 100644 --- a/gdb/valarith.c +++ b/gdb/valarith.c @@ -294,7 +294,7 @@ value_user_defined_cpp_op (struct value **args, int nargs, char *operator, struct value *valp = NULL; find_overload_match (args, nargs, operator, BOTH /* could be method */, - 0 /* strict match */, &args[0], /* objp */ + &args[0] /* objp */, NULL /* pass NULL symbol since symbol is unknown */, &valp, &symp, static_memfuncp, 0); diff --git a/gdb/valops.c b/gdb/valops.c index b9bc460fa67..5b2abf4af89 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -2516,11 +2516,9 @@ value_find_oload_method_list (struct value **argp, const char *method, /* Given an array of arguments (ARGS) (which includes an entry for "this" in the case of C++ methods), the number of - arguments NARGS, the NAME of a function whether it's a method or - not (METHOD), and the degree of laxness (LAX) in conforming to - overload resolution rules in ANSI C++, find the best function that - matches on the argument types according to the overload resolution - rules. + arguments NARGS, the NAME of a function, and whether it's a method or + not (METHOD), find the best function that matches on the argument types + according to the overload resolution rules. METHOD can be one of three values: NON_METHOD for non-member functions. @@ -2559,7 +2557,7 @@ value_find_oload_method_list (struct value **argp, const char *method, int find_overload_match (struct value **args, int nargs, const char *name, enum oload_search_type method, - int lax, struct value **objp, struct symbol *fsym, + struct value **objp, struct symbol *fsym, struct value **valp, struct symbol **symp, int *staticp, const int no_adl) { diff --git a/gdb/value.h b/gdb/value.h index 5825f6eca1f..97ceeab5c7d 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -651,7 +651,7 @@ enum oload_search_type { NON_METHOD, METHOD, BOTH }; extern int find_overload_match (struct value **args, int nargs, const char *name, - enum oload_search_type method, int lax, + enum oload_search_type method, struct value **objp, struct symbol *fsym, struct value **valp, struct symbol **symp, int *staticp, const int no_adl); -- 2.30.2