From e7843f3382abd7364c488cf7d1d99c9b5f1fa6bb Mon Sep 17 00:00:00 2001 From: Mike Stump Date: Tue, 21 Nov 1995 01:15:30 +0000 Subject: Bring over: * init.c (expand_aggr_init): Handle cv qualifiers on the object's type. From-SVN: r10581 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/init.c | 3 +++ 2 files changed, 8 insertions(+) (limited to 'gcc') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c3fe8be..d2ef74f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -6,6 +6,11 @@ Mon Nov 20 14:05:00 1995 Mike Stump * g++.c (pfatal_with_name): Add missing third argument to concat. +Thu Oct 26 13:59:54 1995 Mike Stump + + * init.c (expand_aggr_init): Handle cv qualifiers on the object's + type. + Sun Nov 12 18:09:35 1995 Mike Stump * Version 2.7.1 released. diff --git a/gcc/cp/init.c b/gcc/cp/init.c index ccce6b7..9752a9b 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -1176,8 +1176,11 @@ expand_aggr_init (exp, init, alias_this, flags) && TREE_TYPE (init) == type) init = CONSTRUCTOR_ELTS (init); #endif + + TREE_TYPE (exp) = TYPE_MAIN_VARIANT (type); expand_aggr_init_1 (TYPE_BINFO (type), exp, exp, init, alias_this, LOOKUP_NORMAL|flags); + TREE_TYPE (exp) = type; TREE_READONLY (exp) = was_const; TREE_THIS_VOLATILE (exp) = was_volatile; } -- cgit v1.1