From 9ac1d79d9dc3517b90c18262e27c64db1ac024bf Mon Sep 17 00:00:00 2001 From: Brendan Kehoe Date: Tue, 28 Apr 1998 07:33:51 +0000 Subject: [PATCH] * decl2.c (ambiguous_decl): Fix NAME parm to be a tree, not int. From-SVN: r19466 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/decl2.c | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8c2180ddc6c..b88315534ab 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +1998-04-28 Brendan Kehoe + + * decl2.c (ambiguous_decl): Fix NAME parm to be a tree, not int. + Mon Apr 27 13:58:10 1998 Mark Mitchell * decl.c (maybe_push_to_top_level): Always clear diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 32f90e84dbe..ac96d24bdcf 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -50,7 +50,7 @@ static void finish_sigtable_vardecl PROTO((tree, tree)); static int is_namespace_ancestor PROTO((tree, tree)); static tree namespace_ancestor PROTO((tree, tree)); static void add_using_namespace PROTO((tree, tree, int)); -static tree ambiguous_decl PROTO((int, tree, tree)); +static tree ambiguous_decl PROTO((tree, tree, tree)); extern int current_class_depth; @@ -3734,8 +3734,7 @@ add_using_namespace (user, used, indirect) XXX I don't want to repeat the entire duplicate_decls here */ static tree ambiguous_decl (name, val1, val2) - int name; - tree val1, val2; + tree name, val1, val2; { my_friendly_assert (val1 != val2, 376); if (is_overloaded_fn (val1) && is_overloaded_fn (val1)) -- 2.30.2