1
0
forked from fsfw/fsfw

merged changes

This commit is contained in:
2020-09-29 14:49:57 +02:00
parent 224248dfa1
commit 485e96f12f
9 changed files with 66 additions and 55 deletions

View File

@ -1,14 +1,15 @@
#ifndef FRAMEWORK_STORAGEMANAGER_LOCALPOOL_H_
#define FRAMEWORK_STORAGEMANAGER_LOCALPOOL_H_
#ifndef FSFW_STORAGEMANAGER_LOCALPOOL_H_
#define FSFW_STORAGEMANAGER_LOCALPOOL_H_
#include "StorageManagerIF.h"
#include "../objectmanager/SystemObject.h"
#include "../serviceinterface/ServiceInterfaceStream.h"
#include "../storagemanager/StorageManagerIF.h"
#include "../objectmanager/ObjectManagerIF.h"
#include "../serviceinterface/ServiceInterfaceStream.h"
#include "../internalError/InternalErrorReporterIF.h"
#include "../storagemanager/StorageAccessor.h"
#include <cstring>
/**
* @brief The LocalPool class provides an intermediate data storage with
* a fixed pool size policy.
@ -184,6 +185,6 @@ private:
ReturnValue_t findEmpty(uint16_t pool_index, uint16_t* element);
};
#include "../storagemanager/LocalPool.tpp"
#include "LocalPool.tpp"
#endif /* FRAMEWORK_STORAGEMANAGER_LOCALPOOL_H_ */
#endif /* FSFW_STORAGEMANAGER_LOCALPOOL_H_ */