diff options
| author | Sean Hunt <scshunt@csclub.uwaterloo.ca> | 2011-05-09 18:22:59 +0000 |
|---|---|---|
| committer | Sean Hunt <scshunt@csclub.uwaterloo.ca> | 2011-05-09 18:22:59 +0000 |
| commit | 023df37c27ee8035664fb62f206ca58f4e2a169d (patch) | |
| tree | da21b0a3c69926e497d7079fa321f0e03bc34870 /lib/Sema/SemaDecl.cpp | |
| parent | 03e92303e6e9d366ff35388b982eea7f7db33e62 (diff) | |
Rename "hasTrivialConstructor" to "hasTrivialDefaultConstructor" and
modify the semantics slightly to accomodate default constructors (I
hope).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@131087 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaDecl.cpp')
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 586a298f2d..71bea3c92d 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -7653,7 +7653,7 @@ bool Sema::CheckNontrivialField(FieldDecl *FD) { CXXSpecialMember member = CXXInvalid; if (!RDecl->hasTrivialCopyConstructor()) member = CXXCopyConstructor; - else if (!RDecl->hasTrivialConstructor()) + else if (!RDecl->hasTrivialDefaultConstructor()) member = CXXConstructor; else if (!RDecl->hasTrivialCopyAssignment()) member = CXXCopyAssignment; @@ -7758,7 +7758,7 @@ void Sema::DiagnoseNontrivial(const RecordType* T, CXXSpecialMember member) { bool (CXXRecordDecl::*hasTrivial)() const; switch (member) { case CXXConstructor: - hasTrivial = &CXXRecordDecl::hasTrivialConstructor; break; + hasTrivial = &CXXRecordDecl::hasTrivialDefaultConstructor; break; case CXXCopyConstructor: hasTrivial = &CXXRecordDecl::hasTrivialCopyConstructor; break; case CXXCopyAssignment: |