From 71fda0ea0cf0bd0e9cbd136b26a3ba8ead055494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Fri, 4 Apr 2014 07:02:36 +0200 Subject: [PATCH] Fixed GCC warning about shadowed variable settings --- test/testuninitvar.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp index 205bf5b49..8a18e64fc 100644 --- a/test/testuninitvar.cpp +++ b/test/testuninitvar.cpp @@ -1714,8 +1714,6 @@ private: // Clear the error buffer.. errout.str(""); - Settings settings; - // Tokenize.. Tokenizer tokenizer(&settings, this); std::istringstream istr(code); @@ -2065,10 +2063,9 @@ private: errout.str(""); // Tokenize.. - Settings settings; - settings.debugwarnings = debugwarnings; - settings.library.returnuninitdata.insert("malloc"); - Tokenizer tokenizer(&settings, this); + Settings settings1(settings); + settings1.debugwarnings = debugwarnings; + Tokenizer tokenizer(&settings1, this); std::istringstream istr(code); tokenizer.tokenize(istr, fname); @@ -2081,7 +2078,7 @@ private: "TestSimplifyTokens instead.\nstr1="+str1+"\nstr2="+str2).c_str()); // Check for redundant code.. - CheckUninitVar checkuninitvar(&tokenizer, &settings, this); + CheckUninitVar checkuninitvar(&tokenizer, &settings1, this); checkuninitvar.testrunner = true; checkuninitvar.check(); }