commit faccd72e2448b552f17992eaba6cfe12ec497e58
author Anders Carlsson <andersca@mac.com> Fri Aug 28 16:57:08 2009 +0000
committer Anders Carlsson <andersca@mac.com> Fri Aug 28 16:57:08 2009 +0000
tree 06e3b132afb8bbcb2785b9c0e26019434453d0d2
parent 1eb79b58e56b99cf557d5d353586a10c5360364d

Fix this for real.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@80377 91177308-0d34-0410-b5e6-96231b3b80d8

lib/AST/DeclCXX.cpp

diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp
index 46acf67..d41e096 100644
--- a/lib/AST/DeclCXX.cpp
+++ b/lib/AST/DeclCXX.cpp
@@ -489,14 +489,14 @@
   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 && 

lib/Sema/SemaDeclCXX.cpp

diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index 31dc8b9..377a9de 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -2785,7 +2785,8 @@
       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, 

lib/Sema/SemaOverload.cpp

diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp
index ab1062f..f22c117 100644
--- a/lib/Sema/SemaOverload.cpp
+++ b/lib/Sema/SemaOverload.cpp
@@ -1394,7 +1394,7 @@
           Constructor = cast<CXXConstructorDecl>(*Con);
         
         if (!Constructor->isInvalidDecl() &&
-            Constructor->isConvertingConstructor()) {
+            Constructor->isConvertingConstructor(AllowExplicit)) {
           if (ConstructorTmpl)
             AddTemplateOverloadCandidate(ConstructorTmpl, false, 0, 0, &From, 
                                          1, CandidateSet,