diff options
| author | Anders Carlsson <andersca@mac.com> | 2009-08-28 16:57:08 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2009-08-28 16:57:08 +0000 |
| commit | faccd72e2448b552f17992eaba6cfe12ec497e58 (patch) | |
| tree | 06e3b132afb8bbcb2785b9c0e26019434453d0d2 /lib/Sema | |
| parent | 1eb79b58e56b99cf557d5d353586a10c5360364d (diff) | |
Fix this for real.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@80377 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema')
| -rw-r--r-- | lib/Sema/SemaDeclCXX.cpp | 3 | ||||
| -rw-r--r-- | lib/Sema/SemaOverload.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
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, |