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

From-SVN: r35895

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cc12acc..22466d7 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -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

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 31e42ae..76e2f11 100644 (file)
--- 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;