diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-01-05 23:06:07 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-01-05 23:06:07 +0000 |
| commit | 8678d44d973989a7af70311572626036219307e2 (patch) | |
| tree | 10ee122eab1ee3f113b89a41c7ccfac65deb88d9 /lib/Parse/ParseDecl.cpp | |
| parent | 2b77cb803c76d01d2d10a58cec9334e2090cd7c3 (diff) | |
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
Diffstat (limited to 'lib/Parse/ParseDecl.cpp')
| -rw-r--r-- | lib/Parse/ParseDecl.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
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()); |