include fixes

This commit is contained in:
Robin Müller 2020-10-28 22:11:13 +01:00
parent 24cb83498a
commit 6325eb7647

View File

@ -1,24 +1,24 @@
#include "CatchDefinitions.h"
#include "../config/cdatapool/dataPoolInit.h" #include "../config/cdatapool/dataPoolInit.h"
#include <fsfw/unittest/config/cdatapool/dataPoolInit.h> #include "../config/objects/Factory.h"
#include <fsfw/unittest/config/objects/Factory.h>
#include <fsfw/unittest/core/CatchDefinitions.h>
#ifdef GCOV #ifdef GCOV
#include <gcov.h> #include <gcov.h>
#endif #endif
#include <fsfw/objectmanager/ObjectManager.h> #include "../../objectmanager/ObjectManager.h"
#include <fsfw/objectmanager/ObjectManagerIF.h> #include "../../objectmanager/ObjectManagerIF.h"
#include <fsfw/storagemanager/StorageManagerIF.h> #include "../../storagemanager/StorageManagerIF.h"
#include <fsfw/datapool/DataPool.h> #include "../../datapoolglob/GlobalDataPool.h"
#include <fsfw/serviceinterface/ServiceInterfaceStream.h> #include "../../serviceinterface/ServiceInterfaceStream.h"
/* Global instantiations normally done in main.cpp */ /* Global instantiations normally done in main.cpp */
/* Initialize Data Pool */ /* Initialize Data Pool */
//namespace glob { namespace glob {
DataPool dataPool(datapool::dataPoolInit); GlobalDataPool dataPool(datapool::dataPoolInit);
//} }
namespace sif { namespace sif {