Tokenizer: removed TestSimplifyTemplate friend class declaration

Author: firewave

lib/tokenize.h

@@ -49,7 +49,6 @@ class CPPCHECKLIB Tokenizer {
 
     friend class SymbolDatabase;
 
-    friend class TestSimplifyTemplate;
     friend class TestSimplifyTypedef;
     friend class TestTokenizer;
 
@@ -115,6 +114,7 @@ class CPPCHECKLIB Tokenizer {
     void removeExtraTemplateKeywords();
 
 
+protected:
     /** Split up template right angle brackets.
      * foo < bar < >> => foo < bar < > >
      */
@@ -353,11 +353,13 @@ class CPPCHECKLIB Tokenizer {
      */
     NORETURN void cppcheckError(const Token *tok) const;
 
+protected:
     /**
      * Setup links for tokens so that one can call Token::link().
      */
     void createLinks();
 
+private:
     /**
      * Setup links between < and >.
      */
@@ -645,8 +647,10 @@ class CPPCHECKLIB Tokenizer {
     /** Symbol database that all checks etc can use */
     SymbolDatabase* mSymbolDatabase{};
 
+protected:
     TemplateSimplifier * const mTemplateSimplifier;
 
+private:
     std::set<nonneg int> mTemplateVarIdUsage;
 
     /** E.g. "A" for code where "#ifdef A" is true. This is used to

test/testsimplifytemplate.cpp

@@ -319,6 +319,15 @@ class TestSimplifyTemplate : public TestFixture {
         TEST_CASE(dumpTemplateArgFrom);
     }
 
+    class TokenizerTest : public Tokenizer
+    {
+        friend class TestSimplifyTemplate;
+    public:
+        TokenizerTest(TokenList tokenList, ErrorLogger &errorLogger)
+            : Tokenizer(std::move(tokenList), errorLogger)
+        {}
+    };
+
     struct CheckOptions
     {
         bool debugwarnings = false;
@@ -5461,7 +5470,7 @@ class TestSimplifyTemplate : public TestFixture {
         tokenlist.appendFileIfNew("test.cpp");
         if (!tokenlist.createTokensFromString(data))
             return false;
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.splitTemplateRightAngleBrackets(false);
 
@@ -5531,7 +5540,7 @@ class TestSimplifyTemplate : public TestFixture {
         tokenlist.appendFileIfNew("test.cpp");
         if (!tokenlist.createTokensFromString(data))
             return false;
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.splitTemplateRightAngleBrackets(false);
 
@@ -5602,7 +5611,7 @@ class TestSimplifyTemplate : public TestFixture {
         TokenList tokenlist{settings, Standards::Language::CPP};
         if (!TokenListHelper::createTokensFromString(tokenlist, data, "test.cpp"))
             return false;
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.splitTemplateRightAngleBrackets(false);
 
@@ -5633,7 +5642,7 @@ class TestSimplifyTemplate : public TestFixture {
 
         if (!TokenListHelper::createTokensFromString(tokenlist, data, "test.cpp"))
             return false;
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.splitTemplateRightAngleBrackets(false);