From 1f40af2ae21849f9dc687c42b33175a5c8ef7fba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sat, 9 Mar 2013 17:55:49 +0100
Subject: [PATCH] Fixed #4637 (false positive: (error) Uninitialized member
 variable (missing function inlining))

---
 lib/tokenize.cpp      |  2 +-
 test/testtokenize.cpp | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 642825d28..4af482f8d 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -2816,7 +2816,7 @@ void Tokenizer::setVarId()
                     continue;
 
                 const Token *tok3 = tok2->next();
-                if (!tok3->isStandardType() && !Token::Match(tok3,"struct|union|class %type%") && tok3->str() != "." && !setVarIdParseDeclaration(&tok3,variableId,executableScope.top())) {
+                if (!tok3->isStandardType() && tok3->str() != "void" && !Token::Match(tok3,"struct|union|class %type%") && tok3->str() != "." && !setVarIdParseDeclaration(&tok3,variableId,executableScope.top())) {
                     variableId[tok2->previous()->str()] = ++_varId;
                     tok = tok2->previous();
                 }
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index 2301e3d81..530a4541f 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -259,6 +259,7 @@ private:
         TEST_CASE(varid_in_class9);     // #4291 - id for variables accessed through 'this'
         TEST_CASE(varid_in_class10);
         TEST_CASE(varid_in_class11);    // #4277 - anonymous union
+        TEST_CASE(varid_in_class12);    // #4637 - method
         TEST_CASE(varid_initList);
         TEST_CASE(varid_operator);
         TEST_CASE(varid_throw);
@@ -4120,6 +4121,18 @@ private:
                       tokenizeDebugListing(code2));
     }
 
+    void varid_in_class12() { // #4637 - method
+        const char code[] = "class Foo {\n"
+                            "private:\n"
+                            "    void f(void);\n"
+                            "};";
+        ASSERT_EQUALS("\n\n##file 0\n"
+                      "1: class Foo {\n"
+                      "2: private:\n"
+                      "3: void f ( ) ;\n"
+                      "4: } ;\n",
+                      tokenizeDebugListing(code));
+    }
 
     void varid_initList() {
         const char code1[] = "class A {\n"