diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
index 487c7c3e5..9d7f41853 100644
--- a/lib/checkuninitvar.cpp
+++ b/lib/checkuninitvar.cpp
@@ -1022,7 +1022,7 @@ Check::FileInfo *CheckUninitVar::getFileInfo(const Tokenizer *tokenizer, const S
     return mfi;
 }
 
-void CheckUninitVar::analyseWholeProgram(const std::list<Check::FileInfo*> &fileInfo, ErrorLogger &errorLogger)
+void CheckUninitVar::analyseWholeProgram(const std::list<Check::FileInfo*> &fileInfo, const Settings&, ErrorLogger &errorLogger)
 {
     (void)fileInfo;
     (void)errorLogger;
diff --git a/lib/checkuninitvar.h b/lib/checkuninitvar.h
index f8f394fee..a4b6ef12b 100644
--- a/lib/checkuninitvar.h
+++ b/lib/checkuninitvar.h
@@ -85,7 +85,7 @@ public:
     Check::FileInfo *getFileInfo(const Tokenizer *tokenizer, const Settings *settings) const;
 
     /** @brief Analyse all file infos for all TU */
-    void analyseWholeProgram(const std::list<Check::FileInfo*> &fileInfo, ErrorLogger &errorLogger);
+    void analyseWholeProgram(const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger);
 
     void analyseFunctions(const Tokenizer *tokenizer, std::set<std::string> &f) const;
 
diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp
index b514a5eec..86ca43be6 100644
--- a/test/testgarbage.cpp
+++ b/test/testgarbage.cpp
@@ -142,7 +142,7 @@ private:
         TEST_CASE(templateSimplifierCrashes);
     }
 
-	std::string checkCode(const char code[], const std::string filename = "test.cpp") {
+	std::string checkCode(const char code[], const std::string& filename = "test.cpp") {
 		// double the tests - run each example as C as well as C++
 		const std::string alternatefilename = (filename=="test.c") ? "test.cpp" : "test.c";
 		// run alternate check first. It should only ensure stability