diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-05-27 23:15:17 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-05-27 23:15:17 +0000 |
| commit | 9787f9bc5aa45ee153ce5a2d0b18b1d8c660219e (patch) | |
| tree | e8401727b8853fb1089e88ea1ff4d78f229202b3 /lib/Sema/JumpDiagnostics.cpp | |
| parent | 460980d3b9d045288041bf8b826899795c60ca1d (diff) | |
Clean up a C++0x/C++03 conditional check.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@132229 91177308-0d34-0410-b5e6-96231b3b80d8
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; } |