summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2012-12-01 03:15:03 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2012-12-01 03:15:03 +0000
commit085a4c2d13ede12f11d003928a2e4618ecf5b8f8 (patch)
tree3fddeaeeed197c5e3d7f011c5b5b0534e1dc9c2f
parent7811425843ab7fb2381a669064d67e45471365bf (diff)
downloadbcm5719-llvm-085a4c2d13ede12f11d003928a2e4618ecf5b8f8.tar.gz
bcm5719-llvm-085a4c2d13ede12f11d003928a2e4618ecf5b8f8.zip
Make these functions more clearly express the test they are performing. No functionality change.
llvm-svn: 169077
-rw-r--r--clang/include/clang/AST/DeclCXX.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/include/clang/AST/DeclCXX.h b/clang/include/clang/AST/DeclCXX.h
index afa94989c6c..0a8e8ff2950 100644
--- a/clang/include/clang/AST/DeclCXX.h
+++ b/clang/include/clang/AST/DeclCXX.h
@@ -1033,7 +1033,7 @@ public:
/// other than the copy or move constructors.
bool hasConstexprNonCopyMoveConstructor() const {
return data().HasConstexprNonCopyMoveConstructor ||
- (!hasUserDeclaredConstructor() &&
+ (needsImplicitDefaultConstructor() &&
defaultedDefaultConstructorIsConstexpr());
}
@@ -1047,7 +1047,7 @@ public:
/// \brief Determine whether this class has a constexpr default constructor.
bool hasConstexprDefaultConstructor() const {
return data().HasConstexprDefaultConstructor ||
- (!data().UserDeclaredConstructor &&
+ (needsImplicitDefaultConstructor() &&
defaultedDefaultConstructorIsConstexpr());
}
OpenPOWER on IntegriCloud