From: Douglas Gregor <dgregor@apple.com>
Date: Wed, 5 Jan 2011 23:06:07 +0000 (+0000)
Subject: Fix an embarrassing think in the disambiguation logic for the ellipsis in a parameter... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8678d44d973989a7af70311572626036219307e2;p=clang

Fix an embarrassing think in the disambiguation logic for the ellipsis in a parameter-type-list

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

diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index ab9173ffab..8e334c3069 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -2831,7 +2831,6 @@ void Parser::ParseDirectDeclarator(Declarator &D) {
     if (Tok.is(tok::ellipsis) &&
         !((D.getContext() == Declarator::PrototypeContext ||
            D.getContext() == Declarator::BlockLiteralContext) &&
-          getCurScope()->getTemplateParamParent() &&
           NextToken().is(tok::r_paren) &&
           !Actions.containsUnexpandedParameterPacks(D)))
       D.setEllipsisLoc(ConsumeToken());