TemplateSimplifier: removed need for test class friend declaration

Author: firewave

lib/templatesimplifier.h

@@ -45,8 +45,6 @@ struct newInstantiation;
 
 /** @brief Simplify templates from the preprocessed and partially simplified code. */
 class CPPCHECKLIB TemplateSimplifier {
-    friend class TestSimplifyTemplate;
-
 public:
     explicit TemplateSimplifier(Tokenizer &tokenizer);
 
@@ -445,6 +443,7 @@ class CPPCHECKLIB TemplateSimplifier {
                               const std::list<std::string> &typeStringsUsedInTemplateInstantiation,
                               const std::string &newName);
 
+protected:
     /**
      * @brief TemplateParametersInDeclaration
      * @param tok  template < typename T, typename S >
@@ -456,6 +455,7 @@ class CPPCHECKLIB TemplateSimplifier {
         const Token * tok,
         std::vector<const Token *> & typeParametersInDeclaration);
 
+private:
     /**
      * Remove a specific "template < ..." template class/function
      */

test/testsimplifytemplate.cpp

@@ -319,6 +319,15 @@ class TestSimplifyTemplate : public TestFixture {
         TEST_CASE(dumpTemplateArgFrom);
     }
 
+    class TemplateSimplifierTest : public TemplateSimplifier
+    {
+        friend class TestSimplifyTemplate;
+    public:
+        TemplateSimplifierTest(Tokenizer &tokenizer)
+            : TemplateSimplifier(tokenizer)
+        {}
+    };
+
     class TokenizerTest : public Tokenizer
     {
         friend class TestSimplifyTemplate;
@@ -5647,7 +5656,7 @@ class TestSimplifyTemplate : public TestFixture {
         tokenizer.splitTemplateRightAngleBrackets(false);
 
         std::vector<const Token *> typeParametersInDeclaration;
-        TemplateSimplifier::getTemplateParametersInDeclaration(tokenizer.tokens()->tokAt(2), typeParametersInDeclaration);
+        TemplateSimplifierTest::getTemplateParametersInDeclaration(tokenizer.tokens()->tokAt(2), typeParametersInDeclaration);
 
         if (params.size() != typeParametersInDeclaration.size())
             return false;