[cfe-commits] r169077 - /cfe/trunk/include/clang/AST/DeclCXX.h

[Richard Smith]

Author: rsmith
Date: Fri Nov 30 21:15:03 2012
New Revision: 169077

URL: http://llvm.org/viewvc/llvm-project?rev=169077&view=rev
Log:
Make these functions more clearly express the test they are performing. No functionality change.

Modified:
    cfe/trunk/include/clang/AST/DeclCXX.h

Modified: cfe/trunk/include/clang/AST/DeclCXX.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclCXX.h?rev=169077&r1=169076&r2=169077&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/DeclCXX.h (original)
+++ cfe/trunk/include/clang/AST/DeclCXX.h Fri Nov 30 21:15:03 2012
@@ -1033,7 +1033,7 @@
   /// other than the copy or move constructors.
   bool hasConstexprNonCopyMoveConstructor() const {
     return data().HasConstexprNonCopyMoveConstructor ||
-           (!hasUserDeclaredConstructor() &&
+           (needsImplicitDefaultConstructor() &&
             defaultedDefaultConstructorIsConstexpr());
   }
 
@@ -1047,7 +1047,7 @@
   /// \brief Determine whether this class has a constexpr default constructor.
   bool hasConstexprDefaultConstructor() const {
     return data().HasConstexprDefaultConstructor ||
-           (!data().UserDeclaredConstructor &&
+           (needsImplicitDefaultConstructor() &&
             defaultedDefaultConstructorIsConstexpr());
   }