OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

decl2.c (add_function): Move error message ... 

* decl2.c (add_function): Move error message ...
	(arg_assoc_namespace): ... from here.

From-SVN: r21167
This commit is contained in:
Martin v. Löwis 1998-07-14 23:34:17 +00:00 committed by Martin v. Löwis
parent 95b3fb4181
commit 5f8ac7d1bb
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
1998-07-14 Martin von Löwis <loewis@informatik.hu-berlin.de>
* decl2.c (add_function): Move error message ...
(arg_assoc_namespace): ... from here.
1998-07-14 Jason Merrill <jason@yorick.cygnus.com>
* parse.y (namespace_qualifier): Fix multiple level handling.

28
gcc/cp/decl2.c
View File

@ -4149,7 +4149,26 @@ add_function (k, fn)
{
if (ovl_member (fn, k->functions))
return 0;
k->functions = build_overload (fn, k->functions);
/* We must find only functions, or exactly one non-function. */
if (k->functions && is_overloaded_fn (k->functions)
&& is_overloaded_fn (fn))
k->functions = build_overload (fn, k->functions);
else
if(k->functions)
{
tree f1 = OVL_CURRENT (k->functions);
tree f2 = fn;
if (is_overloaded_fn (f1))
{
fn = f1; f1 = f2; f2 = fn;
}
cp_error_at ("`%D' is not a function,", f1);
cp_error_at (" conflict with `%D'", f2);
cp_error (" in call to `%D'", k->name);
return 1;
}
else
k->functions = fn;
return 0;
}
@ -4170,13 +4189,6 @@ arg_assoc_namespace (k, scope)
if (!value)
return 0;
if (!is_overloaded_fn (value))
{
cp_error_at ("`%D' is not a function", value);
cp_error ("in call to `%D'", k->name);
return 1;
}
for (; value; value = OVL_NEXT (value))
if (add_function (k, OVL_CURRENT (value)))
return 1;