diff options
Diffstat (limited to 'lib/Sema/JumpDiagnostics.cpp')
| -rw-r--r-- | lib/Sema/JumpDiagnostics.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/Sema/JumpDiagnostics.cpp b/lib/Sema/JumpDiagnostics.cpp index c1bcbef146..ae154aae20 100644 --- a/lib/Sema/JumpDiagnostics.cpp +++ b/lib/Sema/JumpDiagnostics.cpp @@ -152,11 +152,10 @@ static std::pair<unsigned,unsigned> = dyn_cast<CXXConstructExpr>(Init)) if (const CXXConstructorDecl *Constructor = Construct->getConstructor()) - if (Constructor->isDefaultConstructor() && - ((Context.getLangOptions().CPlusPlus0x && - Record->hasTrivialDefaultConstructor()) || - (!Context.getLangOptions().CPlusPlus0x && - Record->isPOD()))) + if ((Context.getLangOptions().CPlusPlus0x + ? Record->hasTrivialDefaultConstructor() + : Record->isPOD()) && + Constructor->isDefaultConstructor()) CallsTrivialConstructor = true; } |