diff options
author | Douglas Gregor <dgregor@apple.com> | 2009-09-14 23:02:14 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2009-09-14 23:02:14 +0000 |
commit | 6010da024cec6cf301c2b41a4bff10c70f7643bf (patch) | |
tree | 491fae93fb7b95f3e1b8dfe08399f09ead6e4415 /clang/lib/Sema | |
parent | 2e0807cd7536a4eb2ecf19b0f86dca72af0bd69b (diff) | |
download | bcm5719-llvm-6010da024cec6cf301c2b41a4bff10c70f7643bf.tar.gz bcm5719-llvm-6010da024cec6cf301c2b41a4bff10c70f7643bf.zip |
Implement partial ordering of function templates when calling a
conversion function.
llvm-svn: 81807
Diffstat (limited to 'clang/lib/Sema')
-rw-r--r-- | clang/lib/Sema/SemaOverload.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp index ce004b8d05d..6c23a844bff 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/lib/Sema/SemaOverload.cpp @@ -3711,7 +3711,8 @@ Sema::isBetterOverloadCandidate(const OverloadCandidate& Cand1, if (FunctionTemplateDecl *BetterTemplate = getMoreSpecializedTemplate(Cand1.Function->getPrimaryTemplate(), Cand2.Function->getPrimaryTemplate(), - TPOC_Call)) + isa<CXXConversionDecl>(Cand1.Function)? TPOC_Conversion + : TPOC_Call)) return BetterTemplate == Cand1.Function->getPrimaryTemplate(); // -- the context is an initialization by user-defined conversion |