Merge branch 'development' into mueller/hk-bugfix

2021-01-24 17:06:48 +01:00 · 2021-01-24 17:06:48 +01:00 · a85c94ea80
commit a85c94ea80
parent 8850b770ee 2f64c16a8a
2 changed files with 12 additions and 4 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -116,7 +116,15 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 		  -Wno-unused-parameter
 		  -Wno-psabi
        )
+		
+	if(NOT DEFINED WARNING_SHADOW_LOCAL)
+		option(WARNING_SHADOW_LOCAL "Show shadows declarations warning." ON)
 	endif()
+	
+	if(WARNING_SHADOW_LOCAL)
+		list(APPEND WARNING_FLAGS "-Wshadow=local")
+	endif()
+	
 endif()

 if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
--- a/datapoollocal/PoolReadHelper.h
+++ b/datapoollocal/PoolReadHelper.h
@ -1,7 +1,7 @@
-#ifndef FSFW_DATAPOOLLOCAL_POOLREADHELPER_H_
-#define FSFW_DATAPOOLLOCAL_POOLREADHELPER_H_
+#ifndef FSFW_DATAPOOL_POOLREADHELPER_H_
+#define FSFW_DATAPOOL_POOLREADHELPER_H_

-#include "LocalPoolDataSetBase.h"
+#include "ReadCommitIF.h"
 #include "../serviceinterface/ServiceInterface.h"
 #include <FSFWConfig.h>

@ -48,4 +48,4 @@ private:



-#endif /* FSFW_DATAPOOLLOCAL_POOLREADHELPER_H_ */
+#endif /* FSFW_DATAPOOL_POOLREADHELPER_H_ */