diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-05-04 01:51:08 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-05-04 01:51:08 +0000 |
| commit | b875c43307289ae0b54b44197fa6488ea15fb5e9 (patch) | |
| tree | ab155ae63951629417b390748e5eaa5261133edd /clang/lib/Sema/SemaTemplateDeduction.cpp | |
| parent | 1b7746e383ca68d09974947eeca6c17bb132a46a (diff) | |
| download | bcm5719-llvm-b875c43307289ae0b54b44197fa6488ea15fb5e9.tar.gz bcm5719-llvm-b875c43307289ae0b54b44197fa6488ea15fb5e9.zip | |
Simplify slightly.
llvm-svn: 181092
Diffstat (limited to 'clang/lib/Sema/SemaTemplateDeduction.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaTemplateDeduction.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Sema/SemaTemplateDeduction.cpp b/clang/lib/Sema/SemaTemplateDeduction.cpp index 70da91e2e06..bbe34d865b2 100644 --- a/clang/lib/Sema/SemaTemplateDeduction.cpp +++ b/clang/lib/Sema/SemaTemplateDeduction.cpp @@ -4101,7 +4101,7 @@ static bool isSameTemplate(TemplateDecl *T1, TemplateDecl *T2) { /// template argument deduction. UnresolvedSetIterator Sema::getMostSpecialized(UnresolvedSetIterator SpecBegin, - UnresolvedSetIterator SpecEnd, + UnresolvedSetIterator SpecEnd, TemplatePartialOrderingContext TPOC, unsigned NumCallArguments, SourceLocation Loc, @@ -4158,11 +4158,10 @@ Sema::getMostSpecialized(UnresolvedSetIterator SpecBegin, } // Diagnose the ambiguity. - if (Complain) + if (Complain) { Diag(Loc, AmbigDiag); - if (Complain) - // FIXME: Can we order the candidates in some sane way? + // FIXME: Can we order the candidates in some sane way? for (UnresolvedSetIterator I = SpecBegin; I != SpecEnd; ++I) { PartialDiagnostic PD = CandidateDiag; PD << getTemplateArgumentBindingsText( @@ -4173,6 +4172,7 @@ Sema::getMostSpecialized(UnresolvedSetIterator SpecBegin, TargetType); Diag((*I)->getLocation(), PD); } + } return SpecEnd; } |
