KSat/fsfw
19
6
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into mueller_framework

Browse Source
This commit is contained in:
Robin Müller
2020-07-02 16:07:16 +02:00
parent 837fecf859 68c41e2396
commit 8011d49ebc
5 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datapool/DataSetBase.cpp → datapool/StaticDataSetBase.cpp
View File

@ -1,4 +1,4 @@
#include <framework/datapool/DataSetBase.h>
#include <framework/datapool/StaticDataSetBase.h>
#include <framework/serviceinterface/ServiceInterfaceStream.h>
DataSetBase::DataSetBase() {

6
datapool/DataSetBase.h → datapool/StaticDataSetBase.h
View File

@ -1,5 +1,5 @@
#ifndef FRAMEWORK_DATAPOOL_DATASETBASE_H_
#define FRAMEWORK_DATAPOOL_DATASETBASE_H_
#ifndef FRAMEWORK_DATAPOOL_STATICDATASETBASE_H_
#define FRAMEWORK_DATAPOOL_STATICDATASETBASE_H_
#include <framework/datapool/DataSetIF.h>
#include <framework/datapool/PoolVariableIF.h>
#include <framework/ipc/MutexIF.h>
@ -146,4 +146,4 @@ private:
ReturnValue_t handleUnreadDatasetCommit(uint32_t lockTimeout);
};
#endif /* FRAMEWORK_DATAPOOL_DATASETBASE_H_ */
#endif /* FRAMEWORK_DATAPOOL_STATICDATASETBASE_H_ */