diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-03-30 09:07:34 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-03-30 09:07:34 +0000 |
| commit | 47402e6b65f64195df2e95e245794bddbb25aada (patch) | |
| tree | bc5dd3d19137e91da336f0aa687ff8aae3e1af70 /gcc/cp/typeck.c | |
| parent | 50d9d0ec93bc47d131a2e629a07de2361ff4d527 (diff) | |
| download | ppe42-gcc-47402e6b65f64195df2e95e245794bddbb25aada.tar.gz ppe42-gcc-47402e6b65f64195df2e95e245794bddbb25aada.zip | |
* call.c (build_method_call): Handle non-scoped destructors, too.
* pt.c (tsubst_copy): Likewise.
* pt.c (print_template_context): Split out...
(push_tinst_level): ...from here.
* friend.c (is_friend): Don't pass a type to decl_function_context.
* typeck.c (convert_for_initialization): Always hand off
conversions to class type.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@18908 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/typeck.c')
| -rw-r--r-- | gcc/cp/typeck.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 9786dfb59c2..dfcda9ad21c 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -7031,8 +7031,7 @@ convert_for_initialization (exp, type, rhs, flags, errtype, fndecl, parmnum) && (IS_SIGNATURE_POINTER (type) || IS_SIGNATURE_REFERENCE (type))) return build_signature_pointer_constructor (type, rhs); - if (IS_AGGR_TYPE (type) - && (TYPE_NEEDS_CONSTRUCTING (type) || TREE_HAS_CONSTRUCTOR (rhs))) + if (IS_AGGR_TYPE (type)) return ocp_convert (type, rhs, CONV_IMPLICIT|CONV_FORCE_TEMP, flags); if (type == TREE_TYPE (rhs)) |
