diff --git a/src/tokenize.h b/src/tokenize.h index 4c9eab5de..94c9ee1cc 100644 --- a/src/tokenize.h +++ b/src/tokenize.h @@ -78,9 +78,6 @@ public: static void deleteTokens(Token *tok); static const char *getParameterName(const Token *ftok, int par); - static bool SameFileName(const char fname1[], const char fname2[]); - - std::string fileLine(const Token *tok) const; // Return size. diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp index 4bcea150b..7775210c6 100644 --- a/test/testmemleak.cpp +++ b/test/testmemleak.cpp @@ -2681,6 +2681,7 @@ private: void free_member_in_sub_func() { + // Member function check("class Tokenizer\n" "{\n" "public:\n" @@ -2708,6 +2709,33 @@ private: " delete tok;\n" "}\n", true); TODO_ASSERT_EQUALS("", errout.str()); + + // Global function + check("void deleteTokens(int *tok)\n" + "{\n" + " delete tok;\n" + "}\n" + "class Tokenizer\n" + "{\n" + "public:\n" + " Tokenizer();\n" + " ~Tokenizer();\n" + "\n" + "private:\n" + " int *_tokens;\n" + "};\n" + "\n" + "Tokenizer::Tokenizer()\n" + "{\n" + " _tokens = new int;\n" + "}\n" + "\n" + "Tokenizer::~Tokenizer()\n" + "{\n" + " deleteTokens(_tokens);\n" + " _tokens = 0;\n" + "}\n", true); + TODO_ASSERT_EQUALS("", errout.str()); } };