diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/AST/DeclCXX.cpp | 4 | ||||
| -rw-r--r-- | lib/Sema/SemaDeclCXX.cpp | 3 | ||||
| -rw-r--r-- | lib/Sema/SemaOverload.cpp | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp index 46acf67d29..d41e0965bc 100644 --- a/lib/AST/DeclCXX.cpp +++ b/lib/AST/DeclCXX.cpp @@ -489,14 +489,14 @@ CXXConstructorDecl::isCopyConstructor(ASTContext &Context, return true; } -bool CXXConstructorDecl::isConvertingConstructor() const { +bool CXXConstructorDecl::isConvertingConstructor(bool AllowExplicit) const { // C++ [class.conv.ctor]p1: // A constructor declared without the function-specifier explicit // that can be called with a single parameter specifies a // conversion from the type of its first parameter to the type of // its class. Such a constructor is called a converting // constructor. - if (isExplicit()) + if (isExplicit() && !AllowExplicit) return false; return (getNumParams() == 0 && diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index 31dc8b92c0..377a9deb41 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -2785,7 +2785,8 @@ Sema::PerformInitializationByConstructor(QualType ClassType, Constructor = cast<CXXConstructorDecl>(*Con); if ((Kind == IK_Direct) || - (Kind == IK_Copy && Constructor->isConvertingConstructor()) || + (Kind == IK_Copy && + Constructor->isConvertingConstructor(/*AllowExplicit=*/false)) || (Kind == IK_Default && Constructor->isDefaultConstructor())) { if (ConstructorTmpl) AddTemplateOverloadCandidate(ConstructorTmpl, false, 0, 0, diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp index ab1062f370..f22c1177e6 100644 --- a/lib/Sema/SemaOverload.cpp +++ b/lib/Sema/SemaOverload.cpp @@ -1394,7 +1394,7 @@ bool Sema::IsUserDefinedConversion(Expr *From, QualType ToType, Constructor = cast<CXXConstructorDecl>(*Con); if (!Constructor->isInvalidDecl() && - Constructor->isConvertingConstructor()) { + Constructor->isConvertingConstructor(AllowExplicit)) { if (ConstructorTmpl) AddTemplateOverloadCandidate(ConstructorTmpl, false, 0, 0, &From, 1, CandidateSet, |