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 | 5ddf182fd3f5f9a68cf683ed7e6ded3c8a61e086 (patch) | |
| tree | 96570982b822159040fca51f5ae81f323ce4460f /clang/lib/Parse/ParseDecl.cpp | |
| parent | a61f676cfed2a9a2c5619026d74b60bc797d0f25 (diff) | |
| download | bcm5719-llvm-5ddf182fd3f5f9a68cf683ed7e6ded3c8a61e086.tar.gz bcm5719-llvm-5ddf182fd3f5f9a68cf683ed7e6ded3c8a61e086.zip | |
Fix an embarrassing think in the disambiguation logic for the ellipsis in a parameter-type-list
llvm-svn: 122924
Diffstat (limited to 'clang/lib/Parse/ParseDecl.cpp')
| -rw-r--r-- | clang/lib/Parse/ParseDecl.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp index ab9173ffab0..8e334c30697 100644 --- a/clang/lib/Parse/ParseDecl.cpp +++ b/clang/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()); |
