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 | d20e795a5beb4d18beda729eb76acab56e6499f7 (patch) | |
| tree | 50b0c45aff1dcb0ce0315b6284a93ac691fce6ae /clang/lib/Sema | |
| parent | e58bd8b1abc1b76489e459c1a8551c507d4b9d56 (diff) | |
| download | bcm5719-llvm-d20e795a5beb4d18beda729eb76acab56e6499f7.tar.gz bcm5719-llvm-d20e795a5beb4d18beda729eb76acab56e6499f7.zip | |
Fix this for real.
llvm-svn: 80377
Diffstat (limited to 'clang/lib/Sema')
| -rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaOverload.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 31dc8b92c0b..377a9deb410 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/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/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp index ab1062f370b..f22c1177e64 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/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, |
