diff options
| author | Mike Stump <mrs@apple.com> | 2005-11-18 23:40:29 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@apple.com> | 2005-11-18 23:40:29 +0000 |
| commit | 037d0887ad9a3f414e67af57ab478c1d2cecd0e3 (patch) | |
| tree | 4485e94760f589adf0f27e512f1e74736da95b8d /gcc/cp | |
| parent | 55b12bd83eab88fb8efeb0955d16802b06753d34 (diff) | |
* c-common.c (handle_cleanup_attribute): Use a lang hook for lookup_name.
* config/darwin-c.c (darwin_pragma_unused): Likewise.
* c-decl.c (lookup_name_two) Remove.
* c-tree.h (lookup_name_two): Remove.
* c-objc-common.h (LANG_HOOKS_LOOKUP_NAME): Add.
* langhooks-def.h (LANG_HOOKS_LOOKUP_NAME): Add.
(LANG_HOOKS_DECLS): Add initializer for LANG_HOOKS_LOOKUP_NAME.
* langhooks.h (lang_hooks_for_decls): Add lookup_name.
cp:
* cp-objcp-common.h (LANG_HOOKS_LOOKUP_NAME): Add.
* name-lookup.c (lookup_name_two): Remove.
(lookup_name_one): Add.
* name-lookup.h (lookup_name_two): Remove.
(lookup_name_one): Add.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@107196 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/cp/cp-objcp-common.h | 2 | ||||
| -rw-r--r-- | gcc/cp/name-lookup.c | 4 | ||||
| -rw-r--r-- | gcc/cp/name-lookup.h | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 378c324909b..42e44da26ba 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2005-11-18 Mike Stump <mrs@apple.com> + + * cp-objcp-common.h (LANG_HOOKS_LOOKUP_NAME): Add. + * name-lookup.c (lookup_name_two): Remove. + (lookup_name_one): Add. + * name-lookup.h (lookup_name_two): Remove. + (lookup_name_one): Add. + 2005-11-15 Jason Merrill <jason@redhat.com> PR c++/24580 diff --git a/gcc/cp/cp-objcp-common.h b/gcc/cp/cp-objcp-common.h index 4a4d400cd6f..bd7f4f7958c 100644 --- a/gcc/cp/cp-objcp-common.h +++ b/gcc/cp/cp-objcp-common.h @@ -151,5 +151,7 @@ extern tree objcp_tsubst_copy_and_build (tree, tree, tsubst_flags_t, #define LANG_HOOKS_TO_TARGET_CHARSET c_common_to_target_charset #undef LANG_HOOKS_GIMPLIFY_EXPR #define LANG_HOOKS_GIMPLIFY_EXPR cp_gimplify_expr +#undef LANG_HOOKS_LOOKUP_NAME +#define LANG_HOOKS_LOOKUP_NAME lookup_name_one #endif /* GCC_CP_OBJCP_COMMON */ diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index ce27704f75f..4302ca6194e 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -4003,9 +4003,9 @@ lookup_name (tree name, int prefer_type) /* Similar to `lookup_name' for the benefit of common code. */ tree -lookup_name_two (tree name, int prefer_type) +lookup_name_one (tree name) { - return lookup_name (name, prefer_type); + return lookup_name (name, 0); } /* Look up NAME for type used in elaborated name specifier in diff --git a/gcc/cp/name-lookup.h b/gcc/cp/name-lookup.h index a6466d3fb74..11c1feca562 100644 --- a/gcc/cp/name-lookup.h +++ b/gcc/cp/name-lookup.h @@ -313,7 +313,7 @@ extern void pushlevel_class (void); extern void poplevel_class (void); extern tree pushdecl_with_scope (tree, cxx_scope *, bool); extern tree lookup_name (tree, int); -extern tree lookup_name_two (tree, int); +extern tree lookup_name_one (tree); extern tree lookup_name_real (tree, int, int, bool, int, int); extern tree lookup_type_scope (tree, tag_scope); extern tree namespace_binding (tree, tree); |