From e4f3f91c18ed60eaaa2c49167e8faad78042b1b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Mon, 2 Jan 2012 19:45:20 +0100
Subject: [PATCH] Reverted 9aa8a496. I don't know why I made this fix.

---
 lib/tokenize.cpp      | 4 ----
 test/testtokenize.cpp | 8 --------
 2 files changed, 12 deletions(-)

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 7fee9a985..8760145d5 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -3652,10 +3652,6 @@ void Tokenizer::setVarId()
             continue;
         }
 
-        if (tok->str() == "using") {
-            continue;
-        }
-
         if (Token::Match(tok, "goto %any% ;"))
             continue;
 
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index 7324f0ea4..b1b3d4fca 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -198,7 +198,6 @@ private:
         TEST_CASE(varid40);   // ticket #3279
         TEST_CASE(varid41);   // ticket #3340 (varid for union type)
         TEST_CASE(varid42);   // ticket #3316 (varid for array)
-        TEST_CASE(varid43);
         TEST_CASE(varid44);
         TEST_CASE(varidFunctionCall1);
         TEST_CASE(varidFunctionCall2);
@@ -3129,13 +3128,6 @@ private:
                       tokenizeDebugListing(code));
     }
 
-    void varid43() {
-        const std::string code("namespace fruit { using banana; }");
-        ASSERT_EQUALS("\n\n##file 0\n"
-                      "1: namespace fruit { using banana ; }\n",
-                      tokenizeDebugListing(code));
-    }
-
     void varid44() {
         const std::string code("class A:public B,public C,public D {};");
         ASSERT_EQUALS("\n\n##file 0\n"