From cc6b51f2d9d5698be7fe3842e4bffc30baebfacc Mon Sep 17 00:00:00 2001
From: Simon Martin <simartin@users.sourceforge.net>
Date: Fri, 7 Nov 2014 23:08:54 +0100
Subject: [PATCH] Ticket #6059: Properly handle class... in parameter lists.

---
 lib/templatesimplifier.cpp | 4 ++--
 test/testtokenize.cpp      | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
index 9e6b70968..8a79b84aa 100644
--- a/lib/templatesimplifier.cpp
+++ b/lib/templatesimplifier.cpp
@@ -240,8 +240,8 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
         if (Token::Match(tok, "& ::| %var%"))
             tok = tok->next();
 
-        // Skip 'typename...' (Ticket #5774)
-        if (Token::simpleMatch(tok, "typename . . .")) {
+        // Skip 'typename...' and 'class...' (Ticket #5774, #6059)
+        if (Token::Match(tok, "typename|class . . .")) {
             tok = tok->tokAt(4);
             continue;
         }
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index a4fc9cd8a..97f864e35 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -4410,7 +4410,7 @@ private:
         tokenizer.tokenize(istr, "test.cpp");   // shouldn't segfault
     }
 
-    void syntax_error_templates_3() { // Ticket #5605, #5759, #5762, #5774, #5823
+    void syntax_error_templates_3() { // Ticket #5605, #5759, #5762, #5774, #5823, #6059
         tokenizeAndStringify("foo() template<typename T1 = T2 = typename = unused, T5 = = unused> struct tuple Args> tuple<Args...> { } main() { foo<int,int,int,int,int,int>(); }");
         tokenizeAndStringify("( ) template < T1 = typename = unused> struct Args { } main ( ) { foo < int > ( ) ; }");
         tokenizeAndStringify("() template < T = typename = x > struct a {} { f <int> () }");
@@ -4432,6 +4432,10 @@ private:
                              "    C() : _a(0), _b(0) {} "
                              "    int _a, _b; "
                              "};");
+        tokenizeAndStringify("template<class... T> struct A { "
+                             "  static int i; "
+                             "}; "
+                             "void f() { A<int>::i = 0; }");
     }
 
     void template_member_ptr() { // Ticket #5786