walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

unit testing: use const_cast instead of defines

This commit is contained in:
Daniel Marjamäki 2010-03-17 21:58:53 +01:00
parent 1b9747f552
commit 2441a79c7b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/testmemleak.cpp
View File

@ -18,10 +18,8 @@
#define private public
#include "tokenize.h" #include "tokenize.h"
#include "checkmemoryleak.h" #include "checkmemoryleak.h"
#undef private
#include "testsuite.h" #include "testsuite.h"
#include <sstream> #include <sstream>
@ -585,9 +583,10 @@ private:
Tokenizer tokenizer; Tokenizer tokenizer;
std::istringstream istr(code); std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp"); tokenizer.tokenize(istr, "test.cpp");
Token *tokens = const_cast<Token *>(tokenizer.tokens());
// replace "if ( ! var )" => "if(!var)" // replace "if ( ! var )" => "if(!var)"
for (Token *tok = tokenizer._tokens; tok; tok = tok->next()) for (Token *tok = tokens; tok; tok = tok->next())
{ {
if (Token::Match(tok, "if|while ( var )")) if (Token::Match(tok, "if|while ( var )"))
{ {
@ -606,7 +605,7 @@ private:
settings._showAll = all; settings._showAll = all;
CheckMemoryLeakInFunction checkMemoryLeak(&tokenizer, &settings, NULL); CheckMemoryLeakInFunction checkMemoryLeak(&tokenizer, &settings, NULL);
all = false; all = false;
checkMemoryLeak.simplifycode(tokenizer._tokens, all); checkMemoryLeak.simplifycode(tokens, all);
std::ostringstream ret; std::ostringstream ret;
for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next())
@ -721,7 +720,7 @@ private:
tokenizer.tokenize(istr, "test.cpp"); tokenizer.tokenize(istr, "test.cpp");
// replace "if ( ! var )" => "if(!var)" // replace "if ( ! var )" => "if(!var)"
for (Token *tok = tokenizer._tokens; tok; tok = tok->next()) for (Token *tok = const_cast<Token *>(tokenizer.tokens()); tok; tok = tok->next())
{ {
if (tok->str() == "if_var") if (tok->str() == "if_var")
{ {