From 5ae7c4506f7520a99bb707daca25d7c3479a9996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 6 Jan 2012 09:09:46 +0100
Subject: [PATCH] Fixed #3015 (xml-style error output when running testrunner
 on particular tests)

---
 test/testmemleak.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
index afde2abeb..46862745a 100644
--- a/test/testmemleak.cpp
+++ b/test/testmemleak.cpp
@@ -348,14 +348,14 @@ private:
 
 
 
-    std::string getcode(const char code[], const char varname[], bool classfunc=false) const {
+    std::string getcode(const char code[], const char varname[], bool classfunc=false) {
         // Clear the error buffer..
         errout.str("");
 
         Settings settings;
 
         // Tokenize..
-        Tokenizer tokenizer(&settings, NULL);
+        Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
         tokenizer.tokenize(istr, "test.cpp");
         tokenizer.simplifyTokenList();
@@ -601,14 +601,14 @@ private:
     }
 
 
-    std::string simplifycode(const char code[]) const {
+    std::string simplifycode(const char code[]) {
         // Clear the error buffer..
         errout.str("");
 
         Settings settings;
 
         // Tokenize..
-        Tokenizer tokenizer(&settings, NULL);
+        Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
         tokenizer.tokenize(istr, "test.cpp");
         Token *tokens = const_cast<Token *>(tokenizer.tokens());
@@ -769,7 +769,7 @@ private:
 
 
     // is there a leak in given code? if so, return the linenr
-    unsigned int dofindleak(const char code[]) const {
+    unsigned int dofindleak(const char code[]) {
         // Clear the error buffer..
         errout.str("");
 
@@ -777,7 +777,7 @@ private:
         settings.debug = settings.debugwarnings = true;
 
         // Tokenize..
-        Tokenizer tokenizer(&settings, NULL);
+        Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
         tokenizer.tokenize(istr, "test.cpp");