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

* decl2.c (arg_assoc): Revert my 2000-08-11 change.

Browse Source 
From-SVN: r35895
This commit is contained in:
Theodore Papadopoulo 2000-08-23 00:54:15 +02:00 committed by Jason Merrill
parent a86d4a919a
commit 3add6264c6
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,7 @@
2000-08-22 Theodore Papadopoulo <Theodore.Papadopoulo@sophia.inria.fr>
* decl2.c (arg_assoc): Revert my 2000-08-11 change.
2000-08-22 Gabriel Dos Reis <gdr@codesourcery.com>
* Makefile.in (error.o): Depends on diagnostic.h
@ -31,7 +35,6 @@
change of 1995-04-13.
(push_tinst_level): Call print_instantiation_context.
2000-08-21 Nix <nix@esperi.demon.co.uk>
* lang-specs.h: Do not process -o or run the assembler if

12
gcc/cp/decl2.c
View File

@ -5068,15 +5068,9 @@ arg_assoc (k, n)
{
my_friendly_assert (TREE_CODE (n) == OVERLOAD, 980715);
for (; n; n = OVL_CHAIN (n))
{
/* Do not consider function template decls during Koenig lookup. */
tree fn = OVL_FUNCTION (n);
if (!DECL_FUNCTION_TEMPLATE_P (fn)
&& arg_assoc_type (k, TREE_TYPE (fn)))
return 1;
}
for (; n; n = OVL_CHAIN (n))
if (arg_assoc_type (k, TREE_TYPE (OVL_FUNCTION (n))))
return 1;
}
return 0;