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 | e3ba404560e7f7abf19015053cb4cbe30d7eda1d (patch) | |
| tree | a49c8d95198021f8bff71af5a315327580a3981c /clang/lib/Sema/JumpDiagnostics.cpp | |
| parent | 873106a93286d1efa07dcf4b5ba6811c78844fc2 (diff) | |
| download | bcm5719-llvm-e3ba404560e7f7abf19015053cb4cbe30d7eda1d.tar.gz bcm5719-llvm-e3ba404560e7f7abf19015053cb4cbe30d7eda1d.zip | |
Clean up a C++0x/C++03 conditional check.
llvm-svn: 132229
Diffstat (limited to 'clang/lib/Sema/JumpDiagnostics.cpp')
| -rw-r--r-- | clang/lib/Sema/JumpDiagnostics.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/clang/lib/Sema/JumpDiagnostics.cpp b/clang/lib/Sema/JumpDiagnostics.cpp index c1bcbef1465..ae154aae206 100644 --- a/clang/lib/Sema/JumpDiagnostics.cpp +++ b/clang/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; } |
