From 14192764c3cbef0a4e122af786cc27d12e9ae15d Mon Sep 17 00:00:00 2001 From: Faisal Vali Date: Thu, 26 Apr 2018 01:05:05 +0000 Subject: [PATCH] Fix a merge conflict that was inadvertently introduced in r330888 - during the reversion of r330794 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@330889 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaTemplate.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp index 190dd0721f..239f3617ca 100644 --- a/lib/Sema/SemaTemplate.cpp +++ b/lib/Sema/SemaTemplate.cpp @@ -4021,12 +4021,6 @@ ExprResult Sema::BuildTemplateIdExpr(const CXXScopeSpec &SS, TemplateKWLoc, TemplateArgs); } - if (R.getAsSingle() && !AnyDependentArguments()) { - return CheckConceptTemplateId(SS, R.getLookupNameInfo(), - R.getAsSingle(), - TemplateKWLoc, TemplateArgs); - } - // We don't want lookup warnings at this point. R.suppressDiagnostics(); -- 2.49.0