Undo accidental commit of a separate patch.
This commit is contained in:
parent
76b2e19d24
commit
2abae2c765
12
gdb/valops.c
12
gdb/valops.c
|
@ -2639,13 +2639,12 @@ value_find_oload_method_list (value_ptr *argp, char *method, int offset,
|
|||
|
||||
int
|
||||
find_overload_match (struct type **arg_types, int nargs, char *name, int method,
|
||||
int lax, value_ptr *objp, struct symbol *fsym,
|
||||
int lax, value_ptr obj, struct symbol *fsym,
|
||||
value_ptr *valp, struct symbol **symp, int *staticp)
|
||||
{
|
||||
int nparms;
|
||||
struct type **parm_types;
|
||||
int champ_nparms = 0;
|
||||
struct value *obj = (objp ? *objp : NULL);
|
||||
|
||||
short oload_champ = -1; /* Index of best overloaded function */
|
||||
short oload_ambiguous = 0; /* Current ambiguity state for overload resolution */
|
||||
|
@ -2869,15 +2868,6 @@ find_overload_match (struct type **arg_types, int nargs, char *name, int method,
|
|||
xfree (func_name);
|
||||
}
|
||||
|
||||
if (objp)
|
||||
{
|
||||
if (TYPE_CODE (VALUE_TYPE (temp)) != TYPE_CODE_PTR
|
||||
&& TYPE_CODE (VALUE_TYPE (*objp)) == TYPE_CODE_PTR)
|
||||
{
|
||||
temp = value_addr (temp);
|
||||
}
|
||||
*objp = temp;
|
||||
}
|
||||
return oload_incompatible ? 100 : (oload_non_standard ? 10 : 0);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue