diff options
| author | Ziemowit Laski <zlaski@apple.com> | 2004-09-22 06:11:20 +0000 |
|---|---|---|
| committer | Ziemowit Laski <zlaski@gcc.gnu.org> | 2004-09-22 06:11:20 +0000 |
| commit | c3002ae940495b847bf703e44a3c40a669e3df8c (patch) | |
| tree | 770e49570a443787a527d1dec875d0b59cbfff28 /gcc/cp | |
| parent | 2353086647674de535811898c2e2bf69517f0a82 (diff) | |
| download | gcc-c3002ae940495b847bf703e44a3c40a669e3df8c.zip gcc-c3002ae940495b847bf703e44a3c40a669e3df8c.tar.gz gcc-c3002ae940495b847bf703e44a3c40a669e3df8c.tar.bz2 | |
cp-lang.c (LANG_HOOKS_FOLD_OBJ_TYPE_REF): Moved here from cp-objcp-common.h.
[gcc/cp/ChangeLog]
2004-09-21 Ziemowit Laski <zlaski@apple.com>
* cp-lang.c (LANG_HOOKS_FOLD_OBJ_TYPE_REF): Moved here from
cp-objcp-common.h.
(objcp_tsubst_copy_and_build): Reformat function signature.
* cp-objcp-common.h (objcp_tsubst_copy_and_build): Likewise.
(LANG_HOOKS_FOLD_OBJ_TYPE_REF): Moved to cp-lang.c.
From-SVN: r87846
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/cp/cp-lang.c | 7 | ||||
| -rw-r--r-- | gcc/cp/cp-objcp-common.h | 4 |
3 files changed, 14 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 333bfc9..05cb728 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2004-09-21 Ziemowit Laski <zlaski@apple.com> + + * cp-lang.c (LANG_HOOKS_FOLD_OBJ_TYPE_REF): Moved here from + cp-objcp-common.h. + (objcp_tsubst_copy_and_build): Reformat function signature. + * cp-objcp-common.h (objcp_tsubst_copy_and_build): Likewise. + (LANG_HOOKS_FOLD_OBJ_TYPE_REF): Moved to cp-lang.c. + 2004-09-21 Zack Weinberg <zack@codesourcery.com> * parser.c (cp_lexer_peek_token, cp_lexer_consume_token): diff --git a/gcc/cp/cp-lang.c b/gcc/cp/cp-lang.c index 3b2590c..0e44a08 100644 --- a/gcc/cp/cp-lang.c +++ b/gcc/cp/cp-lang.c @@ -49,6 +49,8 @@ static int cxx_types_compatible_p (tree, tree); #define LANG_HOOKS_DECL_PRINTABLE_NAME cxx_printable_name #undef LANG_HOOKS_TYPES_COMPATIBLE_P #define LANG_HOOKS_TYPES_COMPATIBLE_P cxx_types_compatible_p +#undef LANG_HOOKS_FOLD_OBJ_TYPE_REF +#define LANG_HOOKS_FOLD_OBJ_TYPE_REF cp_fold_obj_type_ref /* Each front end provides its own lang hook initializer. */ const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER; @@ -119,8 +121,9 @@ static int cxx_types_compatible_p (tree x, tree y) /* The following function does something real, but only in Objective-C++. */ tree -objcp_tsubst_copy_and_build (tree t ATTRIBUTE_UNUSED, tree args ATTRIBUTE_UNUSED, - tsubst_flags_t complain ATTRIBUTE_UNUSED, +objcp_tsubst_copy_and_build (tree t ATTRIBUTE_UNUSED, + tree args ATTRIBUTE_UNUSED, + tsubst_flags_t complain ATTRIBUTE_UNUSED, tree in_decl ATTRIBUTE_UNUSED, bool function_p ATTRIBUTE_UNUSED) { diff --git a/gcc/cp/cp-objcp-common.h b/gcc/cp/cp-objcp-common.h index a6ab383..b093150 100644 --- a/gcc/cp/cp-objcp-common.h +++ b/gcc/cp/cp-objcp-common.h @@ -33,7 +33,7 @@ extern void cxx_initialize_diagnostics (struct diagnostic_context *); /* In cp/cp-lang.c and objcp/objcp-lang.c. */ -extern tree objcp_tsubst_copy_and_build (tree, tree, tsubst_flags_t, +extern tree objcp_tsubst_copy_and_build (tree, tree, tsubst_flags_t, tree, bool); /* Lang hooks that are shared between C++ and ObjC++ are defined here. Hooks @@ -158,7 +158,5 @@ extern tree objcp_tsubst_copy_and_build (tree, tree, tsubst_flags_t, #define LANG_HOOKS_REGISTER_BUILTIN_TYPE c_register_builtin_type #undef LANG_HOOKS_GIMPLIFY_EXPR #define LANG_HOOKS_GIMPLIFY_EXPR cp_gimplify_expr -#undef LANG_HOOKS_FOLD_OBJ_TYPE_REF -#define LANG_HOOKS_FOLD_OBJ_TYPE_REF cp_fold_obj_type_ref #endif /* GCC_CP_OBJCP_COMMON */ |