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

mueller_merge_mohr_serialize #11

Closed
muellerr wants to merge 22 commits from mueller_merge_mohr_serialize into front_branch
pull from: mueller_merge_mohr_serialize
merge into: KSat:front_branch
Conversation 0 Commits 22 Files Changed 81 +6 -6
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3e069c34aa - Show all commits

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

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

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

@ -1,5 +1,5 @@
#ifndef FRAMEWORK_DATAPOOL_STATICDATASETBASE_H_
#define FRAMEWORK_DATAPOOL_STATICDATASETBASE_H_
#ifndef FRAMEWORK_DATAPOOL_DATASETBASE_H_
#define FRAMEWORK_DATAPOOL_DATASETBASE_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_STATICDATASETBASE_H_ */
#endif /* FRAMEWORK_DATAPOOL_DATASETBASE_H_ */

2
datapoolglob/GlobalDataSet.h
View File

@ -1,7 +1,7 @@
#ifndef DATASET_H_
#define DATASET_H_
#include <framework/datapool/StaticDataSetBase.h>
#include <framework/datapool/DataSetBase.h>
/**
* @brief The DataSet class manages a set of locally checked out variables

2
datapoollocal/LocalDataSet.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALDATASET_H_
#define FRAMEWORK_DATAPOOLLOCAL_LOCALDATASET_H_
#include <framework/datapool/DataSetBase.h>
#include <framework/datapool/DataSetIF.h>
#include <framework/datapool/StaticDataSetBase.h>
#include <framework/datapoollocal/OwnsLocalDataPoolIF.h>
#include <framework/serialize/SerializeIF.h>