diff options
| author | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-08-17 13:10:50 +0000 |
|---|---|---|
| committer | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-08-17 13:10:50 +0000 |
| commit | ffe5bd741e8b0074419d84398b8bdfb641df2e3e (patch) | |
| tree | 6d50b727176b151472606d3cc6e5adf0682b6d63 /gcc/cp/cvt.c | |
| parent | 81c04fb905f875ed58aaa63a9c07f74a4d09f8dc (diff) | |
| download | gcc-ffe5bd741e8b0074419d84398b8bdfb641df2e3e.tar.gz | |
* cp-tree.h (instantiate_type_flags): New enumeration.
(instantiate_type): Change parameter.
* class.c (instantiate_type): Adjust prototype. Adjust.
* call.c (standard_conversion): Adjust instantiate_type call.
(reference_binding): Likewise.
(build_op_delete_call): Likewise.
(convert_like_real): Likewise.
* cvt.c (cp_convert_to_pointer): Likewise.
(convert_to_reference): Likewise.
* pt.c (convert_nontype_argument): Likewise.
* typeck.c (build_binary_op): Likewise.
(build_ptrmemfunc): Likewise.
(convert_for_assignment): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35757 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/cvt.c')
| -rw-r--r-- | gcc/cp/cvt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index 977571d0f68..77e7ae81ed1 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -267,7 +267,7 @@ cp_convert_to_pointer (type, expr) } if (type_unknown_p (expr)) - return instantiate_type (type, expr, 1); + return instantiate_type (type, expr, itf_no_attributes); cp_error ("cannot convert `%E' from type `%T' to type `%T'", expr, intype, type); @@ -464,7 +464,8 @@ convert_to_reference (reftype, expr, convtype, flags, decl) if (TREE_CODE (type) == FUNCTION_TYPE && intype == unknown_type_node) { expr = instantiate_type (type, expr, - (flags & LOOKUP_COMPLAIN) != 0); + (flags & LOOKUP_COMPLAIN) + ? itf_complain : itf_none); if (expr == error_mark_node) return error_mark_node; |