diff options
| author | Faisal Vali <faisalv@yahoo.com> | 2018-04-26 01:05:05 +0000 |
|---|---|---|
| committer | Faisal Vali <faisalv@yahoo.com> | 2018-04-26 01:05:05 +0000 |
| commit | 2ee366d30e403722daec0506117f13052b9367c9 (patch) | |
| tree | 8368376a34ef5241f70fb685f6a7cacb9a56a4f4 /clang/lib/Sema/SemaTemplate.cpp | |
| parent | a534f07f8c790c6a2244a183aed4b38d5485236a (diff) | |
| download | bcm5719-llvm-2ee366d30e403722daec0506117f13052b9367c9.tar.gz bcm5719-llvm-2ee366d30e403722daec0506117f13052b9367c9.zip | |
Fix a merge conflict that was inadvertently introduced in r330888
- during the reversion of r330794
llvm-svn: 330889
Diffstat (limited to 'clang/lib/Sema/SemaTemplate.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaTemplate.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp index 190dd0721fd..239f3617ca9 100644 --- a/clang/lib/Sema/SemaTemplate.cpp +++ b/clang/lib/Sema/SemaTemplate.cpp @@ -4021,12 +4021,6 @@ ExprResult Sema::BuildTemplateIdExpr(const CXXScopeSpec &SS, TemplateKWLoc, TemplateArgs); } - if (R.getAsSingle<ConceptDecl>() && !AnyDependentArguments()) { - return CheckConceptTemplateId(SS, R.getLookupNameInfo(), - R.getAsSingle<ConceptDecl>(), - TemplateKWLoc, TemplateArgs); - } - // We don't want lookup warnings at this point. R.suppressDiagnostics(); |
