diff options
Diffstat (limited to 'lib/Sema/SemaInit.cpp')
| -rw-r--r-- | lib/Sema/SemaInit.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp index 6eb072eeba..43adc2a82f 100644 --- a/lib/Sema/SemaInit.cpp +++ b/lib/Sema/SemaInit.cpp @@ -38,9 +38,13 @@ int InitListChecker::numArrayElements(QualType DeclType) { int InitListChecker::numStructUnionElements(QualType DeclType) { RecordDecl *structDecl = DeclType->getAsRecordType()->getDecl(); + int InitializableMembers = 0; + for (int i = 0; i < structDecl->getNumMembers(); i++) + if (structDecl->getMember(i)->getIdentifier()) + ++InitializableMembers; if (structDecl->getKind() == Decl::Union) - return std::min(structDecl->getNumMembers(), 1); - return structDecl->getNumMembers() - structDecl->hasFlexibleArrayMember(); + return std::min(InitializableMembers, 1); + return InitializableMembers - structDecl->hasFlexibleArrayMember(); } void InitListChecker::CheckImplicitInitList(InitListExpr *ParentIList, |