From 3add6264c64497e1bdd89e5106961a2ba96d312e Mon Sep 17 00:00:00 2001 From: Theodore Papadopoulo Date: Wed, 23 Aug 2000 00:54:15 +0200 Subject: [PATCH] * decl2.c (arg_assoc): Revert my 2000-08-11 change. From-SVN: r35895 --- gcc/cp/ChangeLog | 5 ++++- gcc/cp/decl2.c | 12 +++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index cc12accc869..22466d78e26 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2000-08-22 Theodore Papadopoulo + + * decl2.c (arg_assoc): Revert my 2000-08-11 change. + 2000-08-22 Gabriel Dos Reis * 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 * lang-specs.h: Do not process -o or run the assembler if diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 31e42ae1dbd..76e2f11fb1c 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -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; -- 2.30.2