[cfe-commits] r132229 - /cfe/trunk/lib/Sema/JumpDiagnostics.cpp

[Douglas Gregor]

Author: dgregor
Date: Fri May 27 18:15:17 2011
New Revision: 132229

URL: http://llvm.org/viewvc/llvm-project?rev=132229&view=rev
Log:
Clean up a C++0x/C++03 conditional check.

Modified:
    cfe/trunk/lib/Sema/JumpDiagnostics.cpp

Modified: cfe/trunk/lib/Sema/JumpDiagnostics.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/JumpDiagnostics.cpp?rev=132229&r1=132228&r2=132229&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/JumpDiagnostics.cpp (original)
+++ cfe/trunk/lib/Sema/JumpDiagnostics.cpp Fri May 27 18:15:17 2011
@@ -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;
           }