aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/method.c
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2011-09-23 17:30:48 -0400
committerJason Merrill <jason@gcc.gnu.org>2011-09-23 17:30:48 -0400
commit6132bdd72ebbcea9621519330d07ccb9a8c29f9d (patch)
tree27fb16e2fc64479b18cb550986fc37b17d95f5ee /gcc/cp/method.c
parentd303ec8e17aa1730e29e5f0666ac82ea131990df (diff)
downloadgcc-6132bdd72ebbcea9621519330d07ccb9a8c29f9d.zip
gcc-6132bdd72ebbcea9621519330d07ccb9a8c29f9d.tar.gz
gcc-6132bdd72ebbcea9621519330d07ccb9a8c29f9d.tar.bz2
Core 234 - allow const objects with no initializer or user-provided default...
Core 234 - allow const objects with no initializer or user-provided default constructor if the defaulted constructor initializes all the subobjects. PR c++/20039 PR c++/42844 * class.c (default_init_uninitialized_part): New. * cp-tree.h: Declare it. * decl.c (check_for_uninitialized_const_var): Use it. * init.c (perform_member_init): Likewise. (build_new_1): Likewise. * method.c (walk_field_subobs): Likewise. From-SVN: r179130
Diffstat (limited to 'gcc/cp/method.c')
-rw-r--r--gcc/cp/method.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 5b24f8f..757e711 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -1015,8 +1015,7 @@ walk_field_subobs (tree fields, tree fnname, special_function_kind sfk,
{
bool bad = true;
if (CP_TYPE_CONST_P (mem_type)
- && (!CLASS_TYPE_P (mem_type)
- || !type_has_user_provided_default_constructor (mem_type)))
+ && default_init_uninitialized_part (mem_type))
{
if (msg)
error ("uninitialized non-static const member %q#D",