[cfe-commits] r122924 - /cfe/trunk/lib/Parse/ParseDecl.cpp

[Douglas Gregor]

Author: dgregor
Date: Wed Jan  5 17:06:07 2011
New Revision: 122924

URL: http://llvm.org/viewvc/llvm-project?rev=122924&view=rev
Log:
Fix an embarrassing think in the disambiguation logic for the ellipsis in a parameter-type-list

Modified:
    cfe/trunk/lib/Parse/ParseDecl.cpp

Modified: cfe/trunk/lib/Parse/ParseDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseDecl.cpp?rev=122924&r1=122923&r2=122924&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseDecl.cpp (original)
+++ cfe/trunk/lib/Parse/ParseDecl.cpp Wed Jan  5 17:06:07 2011
@@ -2831,7 +2831,6 @@
     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());