diff options
| author | Bernardo Innocenti <bernie@develer.com> | 2003-11-15 20:34:57 +0100 |
|---|---|---|
| committer | Bernardo Innocenti <bernie@gcc.gnu.org> | 2003-11-15 20:34:57 +0100 |
| commit | 206279ba4ab002a079cd7b7365aaac7963143c17 (patch) | |
| tree | fd72198c53ff6c7f335ca3efe504eaecd78af61d /gcc | |
| parent | c85dfef7a0385d2c4f54495d8882c0f1d3aef4b0 (diff) | |
| download | gcc-206279ba4ab002a079cd7b7365aaac7963143c17.zip gcc-206279ba4ab002a079cd7b7365aaac7963143c17.tar.gz gcc-206279ba4ab002a079cd7b7365aaac7963143c17.tar.bz2 | |
re PR c++/2294 (using declaration confusion)
PR c++/2294
* name-lookup.c: Revert previous patch for PR c++/2294 to prevent
build failure on libjava.
From-SVN: r73630
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/name-lookup.c | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e773b79..eb3b0f0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2003-11-15 Bernardo Innocenti <bernie@develer.com> + + PR c++/2294 + * name-lookup.c: Revert previous patch for PR c++/2294 to prevent + build failure on libjava. + 2003-11-14 Giovanni Bajo <giovannibajo@libero.it> PR c++/2294 diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index bb4b0ac..a31aeeb 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -2002,7 +2002,7 @@ push_overloaded_decl (tree decl, int flags) } } - if (!DECL_ARTIFICIAL (decl)) + if (old || TREE_CODE (decl) == TEMPLATE_DECL) { if (old && TREE_CODE (old) != OVERLOAD) new_binding = ovl_cons (decl, ovl_cons (old, NULL_TREE)); @@ -2012,6 +2012,7 @@ push_overloaded_decl (tree decl, int flags) OVL_USED (new_binding) = 1; } else + /* NAME is not ambiguous. */ new_binding = decl; if (doing_global) @@ -2869,11 +2870,7 @@ set_namespace_binding (tree name, tree scope, tree val) if (scope == NULL_TREE) scope = global_namespace; b = binding_for_name (NAMESPACE_LEVEL (scope), name); - if (!b->value - /* If OVL_CHAIN is NULL, it's the first FUNCTION_DECL for this name, - and we still need to call supplement_binding. */ - || (TREE_CODE (val) == OVERLOAD && OVL_CHAIN (val)) - || val == error_mark_node) + if (!b->value || TREE_CODE (val) == OVERLOAD || val == error_mark_node) b->value = val; else supplement_binding (b, val); |