diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2002-02-07 20:51:15 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2002-02-07 20:51:15 +0000 |
| commit | c2ea3a40d9d7f302ba6f9279163d201410b39a4c (patch) | |
| tree | 53f5bd8a588ac97b8f047d7835a6c4f71ec062a8 /gcc/cp/call.c | |
| parent | 3ab57fab23a0e65a4acbee0aac497b92ec8cb9f8 (diff) | |
| download | gcc-c2ea3a40d9d7f302ba6f9279163d201410b39a4c.zip gcc-c2ea3a40d9d7f302ba6f9279163d201410b39a4c.tar.gz gcc-c2ea3a40d9d7f302ba6f9279163d201410b39a4c.tar.bz2 | |
Rename instantiate_type_flags to tsubst_flags_t & expand use.
* cp-tree.h (instantiate_type_flags): Rename to ...
(tsubst_flags_t): ... here. Rename itf_complain to tf_error,
add tf_warning flag.
(instantiate_type): Adjust prototype.
(tsubst, tsubst_expr, tsubst_copy, lookup_template_class,
do_type_instantiation, cp_build_qualified_type_real): Likewise.
cp_build_qualified_type: Adjust.
* class.c (instantiate_type): Adjust parameter. Rename itf_* to
tf_*.
* call.c (standard_conversion): Rename itf_* to tf_*.
(reference_binding): Likewise.
(convert_like_real): Likewise.
* cvt.c (cp_convert_to_pointer): Likewise.
(convert_to_reference): Likewise.
* decl.c (lookup_namespace_name): Use tf_* flags.
(make_typename_type): Likewise.
(grokdeclarator): Likewise.
* pt.c (convert_nontype_argument): Adjust COMPLAIN usage.
(coerce_template_template_parms, convert_template_argument,
coerce_template_parms, maybe_get_template_decl_from_type_decl,
lookup_template_class, tsubst_friend_function, tsubst_friend_class,
instantiate_class_template, tsubst_template_arg_vector,
tsubst_template_parms, tsubst_aggr_type, tsubst_default_argument,
tsubst_decl, tsubst_arg_types, tsubst_function_type,
tsubst_call_declarator_parms, tsubst, tsubst_copy, tsubst_expr,
instantiate_template, fn_type_unification,
resolve_overloaded_unification, verify_class_unification,
unify, get_bindings_real, do_type_instantiation,
regenerate_decl_from_template, instantiate_decl,
tsubst_initializer_list, tsubst_enum,
get_mostly_instantiated_function_type,
invalid_nontype_parm_type_p): Likewise.
* tree.c (cp_build_qualified_type_real): Likewise.
* typeck.c (build_binary_op): Rename itf_* to tf_*.
(build_ptrmemfunc): Likewise.
(convert_for_assignment): Likewise.
From-SVN: r49591
Diffstat (limited to 'gcc/cp/call.c')
| -rw-r--r-- | gcc/cp/call.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 925bd06..29e0c72 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -705,7 +705,7 @@ standard_conversion (to, from, expr) if ((TYPE_PTRFN_P (to) || TYPE_PTRMEMFUNC_P (to)) && expr && type_unknown_p (expr)) { - expr = instantiate_type (to, expr, itf_none); + expr = instantiate_type (to, expr, tf_none); if (expr == error_mark_node) return NULL_TREE; from = TREE_TYPE (expr); @@ -1108,7 +1108,7 @@ reference_binding (rto, rfrom, expr, flags) if (TREE_CODE (to) == FUNCTION_TYPE && expr && type_unknown_p (expr)) { - expr = instantiate_type (to, expr, itf_none); + expr = instantiate_type (to, expr, tf_none); if (expr == error_mark_node) return NULL_TREE; from = TREE_TYPE (expr); @@ -3864,7 +3864,7 @@ convert_like_real (convs, expr, fn, argnum, inner) } case IDENTITY_CONV: if (type_unknown_p (expr)) - expr = instantiate_type (totype, expr, itf_complain); + expr = instantiate_type (totype, expr, tf_error | tf_warning); return expr; case AMBIG_CONV: /* Call build_user_type_conversion again for the error. */ |