diff options
author | Jakub Jelinek <jakub@redhat.com> | 2019-08-27 15:19:26 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2019-08-27 15:19:26 +0000 |
commit | 522f3b741606e806f058efcdf6474f2cdcc56718 (patch) | |
tree | 73bbe6e4ed1d559a032261161b45b7d06167927d /gcc/cp/cp-tree.h | |
parent | bd903dd991637c9f6a7d767e1b52c45fe89d55fe (diff) | |
parent | 78b52ce61b320949dc277b5911f8dba81d1ffb40 (diff) |
svn merge -r271960:274943 svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/redhat/gcc-9-branch@274959 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/cp-tree.h')
-rw-r--r-- | gcc/cp/cp-tree.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index ff4ce068a83..e15a07392ca 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -423,7 +423,6 @@ extern GTY(()) tree cp_global_trees[CPTI_MAX]; LAMBDA_EXPR_MUTABLE_P (in LAMBDA_EXPR) DECL_FINAL_P (in FUNCTION_DECL) QUALIFIED_NAME_IS_TEMPLATE (in SCOPE_REF) - DECLTYPE_FOR_INIT_CAPTURE (in DECLTYPE_TYPE) CONSTRUCTOR_IS_DEPENDENT (in CONSTRUCTOR) TINFO_USED_TEMPLATE_ID (in TEMPLATE_INFO) PACK_EXPANSION_SIZEOF_P (in *_PACK_EXPANSION) @@ -4471,12 +4470,10 @@ more_aggr_init_expr_args_p (const aggr_init_expr_arg_iterator *iter) (DECLTYPE_TYPE_CHECK (NODE))->type_common.string_flag /* These flags indicate that we want different semantics from normal - decltype: lambda capture just drops references, init capture - uses auto semantics, lambda proxies look through implicit dereference. */ + decltype: lambda capture just drops references, + lambda proxies look through implicit dereference. */ #define DECLTYPE_FOR_LAMBDA_CAPTURE(NODE) \ TREE_LANG_FLAG_0 (DECLTYPE_TYPE_CHECK (NODE)) -#define DECLTYPE_FOR_INIT_CAPTURE(NODE) \ - TREE_LANG_FLAG_1 (DECLTYPE_TYPE_CHECK (NODE)) #define DECLTYPE_FOR_LAMBDA_PROXY(NODE) \ TREE_LANG_FLAG_2 (DECLTYPE_TYPE_CHECK (NODE)) #define DECLTYPE_FOR_REF_CAPTURE(NODE) \ @@ -6779,7 +6776,7 @@ extern bool maybe_instantiate_noexcept (tree, tsubst_flags_t = tf_warning_or_er extern tree instantiate_decl (tree, bool, bool); extern int comp_template_parms (const_tree, const_tree); extern bool builtin_pack_fn_p (tree); -extern bool uses_parameter_packs (tree); +extern tree uses_parameter_packs (tree); extern bool template_parameter_pack_p (const_tree); extern bool function_parameter_pack_p (const_tree); extern bool function_parameter_expanded_from_pack_p (tree, tree); |