Merge remote-tracking branch 'upstream/mueller/master' into development

moved read helper into correct folder
2021-01-14 12:22:38 +01:00 · 2021-01-14 12:21:40 +01:00
1 changed files with 4 additions and 4 deletions
--- 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_ */
Author	SHA1	Message	Date
Robin.Mueller	4cf15e9ec6	Merge remote-tracking branch 'upstream/mueller/master' into development	2021-01-14 12:22:38 +01:00
Robin.Mueller	d6b0af3be7	moved read helper into correct folder	2021-01-14 12:21:40 +01:00