From: Douglas Gregor <dgregor@apple.com>
Date: Fri, 27 May 2011 23:15:17 +0000 (+0000)
Subject: Clean up a C++0x/C++03 conditional check.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9787f9bc5aa45ee153ce5a2d0b18b1d8c660219e;p=clang

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
---

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;
           }