diff options
| author | Jason Merrill <jason@redhat.com> | 2013-04-07 17:15:35 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2013-04-07 17:15:35 +0000 |
| commit | 8e750521c17772566f510d5e9d0254667fffad21 (patch) | |
| tree | 9bd0bad86272381b52f9331da1fd8f8d46afe701 /gcc/cp | |
| parent | 705bd9089afbbe4a9bbebb5aba4c3166961fdbc4 (diff) | |
* cp-tree.h (FUNCTION_OR_METHOD_TYPE_CHECK): Remove.
(FUNCTION_REF_QUALIFIED): Use FUNC_OR_METHOD_CHECK instead.
(FUNCTION_RVALUE_QUALIFIED): Likewise.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch@197556 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d0e34c679a5..3002ccf8242 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2013-04-03 Jason Merrill <jason@redhat.com> + + * cp-tree.h (FUNCTION_OR_METHOD_TYPE_CHECK): Remove. + (FUNCTION_REF_QUALIFIED): Use FUNC_OR_METHOD_CHECK instead. + (FUNCTION_RVALUE_QUALIFIED): Likewise. + 2013-04-03 Jakub Jelinek <jakub@redhat.com> PR debug/56819 diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index e477583345f..099d64c6a04 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -222,9 +222,6 @@ c-common.h, not after. #define BOUND_TEMPLATE_TEMPLATE_PARM_TYPE_CHECK(NODE) \ TREE_CHECK(NODE,BOUND_TEMPLATE_TEMPLATE_PARM) -#define FUNCTION_OR_METHOD_TYPE_CHECK(NODE) \ - TREE_CHECK2(NODE,FUNCTION_TYPE,METHOD_TYPE) - #if defined ENABLE_TREE_CHECKING && (GCC_VERSION >= 2007) #define THUNK_FUNCTION_CHECK(NODE) __extension__ \ ({ __typeof (NODE) const __t = (NODE); \ @@ -2511,11 +2508,11 @@ struct GTY((variable_size)) lang_decl { /* 1 iff FUNCTION_TYPE or METHOD_TYPE has a ref-qualifier (either & or &&). */ #define FUNCTION_REF_QUALIFIED(NODE) \ - TREE_LANG_FLAG_4 (FUNCTION_OR_METHOD_TYPE_CHECK (NODE)) + TREE_LANG_FLAG_4 (FUNC_OR_METHOD_CHECK (NODE)) /* 1 iff FUNCTION_TYPE or METHOD_TYPE has &&-ref-qualifier. */ #define FUNCTION_RVALUE_QUALIFIED(NODE) \ - TREE_LANG_FLAG_5 (FUNCTION_OR_METHOD_TYPE_CHECK (NODE)) + TREE_LANG_FLAG_5 (FUNC_OR_METHOD_CHECK (NODE)) /* Returns 1 iff VAR_DECL is a construction virtual table. DECL_VTABLE_OR_VTT_P will be true in this case and must be checked |