diff options
| author | Jason Merrill <jason@redhat.com> | 2013-04-03 23:13:51 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2013-04-03 23:13:51 -0400 |
| commit | 7d27c734a34c27e7e59c39393b2aeda4888b01f7 (patch) | |
| tree | ccb7ed854f5ffb181ea2495af4d4d012e974b937 | |
| parent | 0baa873fa349fafa18e42341cfd280e906f94ee7 (diff) | |
| download | gcc-7d27c734a34c27e7e59c39393b2aeda4888b01f7.zip gcc-7d27c734a34c27e7e59c39393b2aeda4888b01f7.tar.gz gcc-7d27c734a34c27e7e59c39393b2aeda4888b01f7.tar.bz2 | |
cp-tree.h (FUNCTION_OR_METHOD_TYPE_CHECK): Remove.
* cp-tree.h (FUNCTION_OR_METHOD_TYPE_CHECK): Remove.
(TYPE_RAISES_EXCEPTIONS): Use FUNC_OR_METHOD_CHECK instead.
(FUNCTION_REF_QUALIFIED, FUNCTION_RVALUE_QUALIFIED): Likewise.
From-SVN: r197466
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ef38bc2..d039f8b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2013-04-03 Jason Merrill <jason@redhat.com> + * cp-tree.h (FUNCTION_OR_METHOD_TYPE_CHECK): Remove. + (TYPE_RAISES_EXCEPTIONS): Use FUNC_OR_METHOD_CHECK instead. + (FUNCTION_REF_QUALIFIED, FUNCTION_RVALUE_QUALIFIED): Likewise. + * mangle.c (write_type): When writing a function type with function-cv-quals, don't add the unqualified type as a substitution candidate. diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 83164a2..e1d1238 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -223,9 +223,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); \ @@ -1888,7 +1885,7 @@ struct GTY((variable_size)) lang_type { (for templates) or an OVERLOAD list of functions (for implicitly declared functions). */ #define TYPE_RAISES_EXCEPTIONS(NODE) \ - TYPE_LANG_SLOT_1 (FUNCTION_OR_METHOD_TYPE_CHECK (NODE)) + TYPE_LANG_SLOT_1 (FUNC_OR_METHOD_CHECK (NODE)) /* For FUNCTION_TYPE or METHOD_TYPE, return 1 iff it is declared `throw()' or noexcept(true). */ @@ -2536,11 +2533,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 |