KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

Merge branch 'development' into mueller/hk-bugfix

Browse Source
This commit is contained in:
Robin Müller 2021-01-24 17:06:48 +01:00
commit a85c94ea80
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -116,7 +116,15 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-Wno-unused-parameter -Wno-unused-parameter
-Wno-psabi -Wno-psabi
) )
if(NOT DEFINED WARNING_SHADOW_LOCAL)
option(WARNING_SHADOW_LOCAL "Show shadows declarations warning." ON)
endif() endif()
if(WARNING_SHADOW_LOCAL)
list(APPEND WARNING_FLAGS "-Wshadow=local")
endif()
endif() endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")

8
datapoollocal/PoolReadHelper.h → datapool/PoolReadHelper.h
View File

@ -1,7 +1,7 @@
#ifndef FSFW_DATAPOOLLOCAL_POOLREADHELPER_H_ #ifndef FSFW_DATAPOOL_POOLREADHELPER_H_
#define FSFW_DATAPOOLLOCAL_POOLREADHELPER_H_ #define FSFW_DATAPOOL_POOLREADHELPER_H_
#include "LocalPoolDataSetBase.h" #include "ReadCommitIF.h"
#include "../serviceinterface/ServiceInterface.h" #include "../serviceinterface/ServiceInterface.h"
#include <FSFWConfig.h> #include <FSFWConfig.h>
@ -48,4 +48,4 @@ private:
#endif /* FSFW_DATAPOOLLOCAL_POOLREADHELPER_H_ */ #endif /* FSFW_DATAPOOL_POOLREADHELPER_H_ */