s [skip ci]

Author: firewave

test/testsymboldatabase.cpp

@@ -74,7 +74,8 @@ class TestSymbolDatabase : public TestFixture {
         typetok = nullptr;
     }
 
-    static const SymbolDatabase* getSymbolDB_inner(SimpleTokenizer& tokenizer, const char* code, bool cpp) {
+    template<size_t size>
+    static const SymbolDatabase* getSymbolDB_inner(SimpleTokenizer& tokenizer, const char (&code)[size], bool cpp) {
         return tokenizer.tokenize(code, cpp) ? tokenizer.getSymbolDatabase() : nullptr;
     }
 
@@ -93,7 +94,8 @@ class TestSymbolDatabase : public TestFixture {
         return tok->expressionString() + "@" + std::to_string(tok->exprId());
     }
 
-    std::string testExprIdEqual(const char code[],
+    template<size_t size>
+    std::string testExprIdEqual(const char (&code)[size],
                                 const std::string& expr1,
                                 unsigned int exprline1,
                                 const std::string& expr2,
@@ -2578,7 +2580,8 @@ class TestSymbolDatabase : public TestFixture {
     }
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], bool debug = true, bool cpp = true, const Settings* pSettings = nullptr) {
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size], bool debug = true, bool cpp = true, const Settings* pSettings = nullptr) {
         // Check..
         const Settings settings = settingsBuilder(pSettings ? *pSettings : settings1).debugwarnings(debug).build();
 
@@ -8719,7 +8722,8 @@ class TestSymbolDatabase : public TestFixture {
         }
     }
 #define typeOf(...) typeOf_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string typeOf_(const char* file, int line, const char code[], const char pattern[], bool cpp = true, const Settings *settings = nullptr) {
+    template<size_t size>
+    std::string typeOf_(const char* file, int line, const char (&code)[size], const char pattern[], bool cpp = true, const Settings *settings = nullptr) {
         SimpleTokenizer tokenizer(settings ? *settings : settings2, *this);
         ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
         const Token* tok;
@@ -10367,9 +10371,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void exprIds()
     {
-        const char* code;
-
-        code = "int f(int a) {\n"
+        const char code[] = "int f(int a) {\n"
                "    return a +\n"
                "           a;\n"
                "}\n";