diff options
| author | Nathan Sidwell <nathan@acm.org> | 2017-06-30 18:46:01 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2017-06-30 18:46:01 +0000 |
| commit | 08fb13163ce5e7dcf61c3ce898a63bb54f1b6d3d (patch) | |
| tree | f11884853ec0043f4c12eafc94bcc8d6898b162f /gcc/cp/pt.c | |
| parent | 618400bc14b5c52a450e91d59632d5b08ae1a325 (diff) | |
| download | gcc-08fb13163ce5e7dcf61c3ce898a63bb54f1b6d3d.zip gcc-08fb13163ce5e7dcf61c3ce898a63bb54f1b6d3d.tar.gz gcc-08fb13163ce5e7dcf61c3ce898a63bb54f1b6d3d.tar.bz2 | |
config-lang.in (gtfiles): Add cp/lex.c.
* config-lang.in (gtfiles): Add cp/lex.c.
* cp-tree.h (mangle_convop_name_for_type): Rename ...
(make_conv_op_name): ... here. Move to lex.
* lambda.c (maybe_add_lambda_conv_op): Update.
* parser.c (cp_parser_conversion_function_id): Update.
* pt.c (tsubst_decl, tsubst_baselink, tsubst_copy,
tsubst_copy_and_build): Update.
* semantics.c (apply_deduced_return_type): Update.
* mangle.c (conv_type_hasher, conv_type_names,
mangle_conv_op_name_for_type): Move to ...
* lex.c (conv_type_hasher, conv_type_names, make_convop_name):
... here. Rename.
* libcp1plugin.cc (plugin_build_decl): Use make_conv_op_name.
(plugin_build_dependent_expr): Likewise.
From-SVN: r249852
Diffstat (limited to 'gcc/cp/pt.c')
| -rw-r--r-- | gcc/cp/pt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 6b6a1a6..bd02951 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -12385,7 +12385,7 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain) if (member && DECL_CONV_FN_P (r)) /* Type-conversion operator. Reconstruct the name, in case it's the name of one of the template's parameters. */ - DECL_NAME (r) = mangle_conv_op_name_for_type (TREE_TYPE (type)); + DECL_NAME (r) = make_conv_op_name (TREE_TYPE (type)); DECL_ARGUMENTS (r) = tsubst (DECL_ARGUMENTS (t), args, complain, t); @@ -14242,7 +14242,7 @@ tsubst_baselink (tree baselink, tree object_type, tree name = OVL_NAME (fns); if (IDENTIFIER_CONV_OP_P (name)) - name = mangle_conv_op_name_for_type (optype); + name = make_conv_op_name (optype); baselink = lookup_fnfields (qualifying_scope, name, /*protect=*/1); if (!baselink) @@ -15032,7 +15032,7 @@ tsubst_copy (tree t, tree args, tsubst_flags_t complain, tree in_decl) if (IDENTIFIER_CONV_OP_P (t)) { tree new_type = tsubst (TREE_TYPE (t), args, complain, in_decl); - return mangle_conv_op_name_for_type (new_type); + return make_conv_op_name (new_type); } else return t; @@ -16665,7 +16665,7 @@ tsubst_copy_and_build (tree t, if (IDENTIFIER_CONV_OP_P (t)) { tree new_type = tsubst (TREE_TYPE (t), args, complain, in_decl); - t = mangle_conv_op_name_for_type (new_type); + t = make_conv_op_name (new_type); } /* Look up the name. */ |