diff options
| author | Geoffrey Keating <geoffk@redhat.com> | 2002-06-04 07:11:05 +0000 |
|---|---|---|
| committer | Geoffrey Keating <geoffk@gcc.gnu.org> | 2002-06-04 07:11:05 +0000 |
| commit | e2500fedef1a1c5b9e818fd1e2c281adff80df4a (patch) | |
| tree | 720630adca0f6b357e05c4feb8cbe33d556925ce /gcc/cp/cp-lang.c | |
| parent | c2ae66169b8326bbf9b1dfa63083d2560fea7ddf (diff) | |
| download | gcc-e2500fedef1a1c5b9e818fd1e2c281adff80df4a.zip gcc-e2500fedef1a1c5b9e818fd1e2c281adff80df4a.tar.gz gcc-e2500fedef1a1c5b9e818fd1e2c281adff80df4a.tar.bz2 | |
Merge from pch-branch up to tag pch-commit-20020603.
From-SVN: r54232
Diffstat (limited to 'gcc/cp/cp-lang.c')
| -rw-r--r-- | gcc/cp/cp-lang.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gcc/cp/cp-lang.c b/gcc/cp/cp-lang.c index ce5165e..f482582 100644 --- a/gcc/cp/cp-lang.c +++ b/gcc/cp/cp-lang.c @@ -66,8 +66,6 @@ static bool cxx_warn_unused_global_decl PARAMS ((tree)); #define LANG_HOOKS_TRUTHVALUE_CONVERSION c_common_truthvalue_conversion #undef LANG_HOOKS_INSERT_DEFAULT_ATTRIBUTES #define LANG_HOOKS_INSERT_DEFAULT_ATTRIBUTES cxx_insert_default_attributes -#undef LANG_HOOKS_MARK_TREE -#define LANG_HOOKS_MARK_TREE cxx_mark_tree #undef LANG_HOOKS_UNSAFE_FOR_REEVAL #define LANG_HOOKS_UNSAFE_FOR_REEVAL c_common_unsafe_for_reeval #undef LANG_HOOKS_SET_DECL_ASSEMBLER_NAME @@ -93,10 +91,8 @@ static bool cxx_warn_unused_global_decl PARAMS ((tree)); #undef LANG_HOOKS_FUNCTION_INIT #define LANG_HOOKS_FUNCTION_INIT cxx_push_function_context -#undef LANG_HOOKS_FUNCTION_FREE -#define LANG_HOOKS_FUNCTION_FREE cxx_pop_function_context -#undef LANG_HOOKS_FUNCTION_MARK -#define LANG_HOOKS_FUNCTION_MARK cxx_mark_function_context +#undef LANG_HOOKS_FUNCTION_FINAL +#define LANG_HOOKS_FUNCTION_FINAL cxx_pop_function_context /* Attribute hooks. */ #undef LANG_HOOKS_COMMON_ATTRIBUTE_TABLE |