TemplateSimplifier: cleaned up member access

Author: firewave

lib/templatesimplifier.h

@@ -265,6 +265,7 @@ class CPPCHECKLIB TemplateSimplifier {
     static Token *findTemplateDeclarationEnd(Token *tok);
     static const Token *findTemplateDeclarationEnd(const Token *tok);
 
+protected:
     /**
      * Match template declaration/instantiation
      * @param instance template instantiation
@@ -275,6 +276,7 @@ class CPPCHECKLIB TemplateSimplifier {
      */
     static bool instantiateMatch(const Token *instance, std::size_t numberOfArguments, bool variadic, const char patternAfter[]);
 
+public: // TODO: only needs to be public for tests
     /**
      * Match template declaration/instantiation
      * @param tok The ">" token e.g. before "class"
@@ -283,6 +285,7 @@ class CPPCHECKLIB TemplateSimplifier {
      */
     int getTemplateNamePosition(const Token *tok);
 
+private:
     /**
      * Get class template name position
      * @param tok The ">" token e.g. before "class"
@@ -307,6 +310,7 @@ class CPPCHECKLIB TemplateSimplifier {
      * */
     static bool getTemplateNamePositionTemplateVariable(const Token *tok, int &namepos);
 
+public:
     /**
      * Simplify templates
      * @param maxtime time when the simplification should be stopped
@@ -322,6 +326,7 @@ class CPPCHECKLIB TemplateSimplifier {
      */
     static bool simplifyNumericCalculations(Token *tok, bool isTemplate = true);
 
+private:
     /**
      * Simplify constant calculations such as "1+2" => "3".
      * This also performs simple cleanup of parentheses etc.
@@ -336,7 +341,6 @@ class CPPCHECKLIB TemplateSimplifier {
      */
     void simplifyTemplateArgs(Token *start, const Token *end, std::vector<newInstantiation>* newInst = nullptr);
 
-private:
     /**
      * Get template declarations
      * @return true if code has templates.

test/testsimplifytemplate.cpp

@@ -5956,7 +5956,7 @@ class TestSimplifyTemplate : public TestFixture {
 
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        return (TemplateSimplifier::instantiateMatch)(tokenizer.tokens(), numberOfArguments, false, patternAfter);
+        return (TemplateSimplifierTest::instantiateMatch)(tokenizer.tokens(), numberOfArguments, false, patternAfter);
     }
 
     void instantiateMatchTest() {