commit 9787f9bc5aa45ee153ce5a2d0b18b1d8c660219e
author Douglas Gregor <dgregor@apple.com> Fri May 27 23:15:17 2011 +0000
committer Douglas Gregor <dgregor@apple.com> Fri May 27 23:15:17 2011 +0000
tree e8401727b8853fb1089e88ea1ff4d78f229202b3
parent 460980d3b9d045288041bf8b826899795c60ca1d

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

lib/Sema/JumpDiagnostics.cpp

diff --git a/lib/Sema/JumpDiagnostics.cpp b/lib/Sema/JumpDiagnostics.cpp
index c1bcbef..ae154aa 100644
--- a/lib/Sema/JumpDiagnostics.cpp
+++ b/lib/Sema/JumpDiagnostics.cpp
@@ -152,11 +152,10 @@
                                         = 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;
           }