diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-08-22 22:54:15 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-08-22 22:54:15 +0000 |
| commit | 27967cdc6309c18765ac976da30c1fdb7c6292cb (patch) | |
| tree | a8414d247e9674f959d5d08a0b41db646bb79aec | |
| parent | f21658046409d5a5bf819d5fd41e168d9bf86cc6 (diff) | |
| download | ppe42-gcc-27967cdc6309c18765ac976da30c1fdb7c6292cb.tar.gz ppe42-gcc-27967cdc6309c18765ac976da30c1fdb7c6292cb.zip | |
* decl2.c (arg_assoc): Revert my 2000-08-11 change.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35895 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 <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 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; |
