From 90d1b601be01658898fc886c08d407c688c41d35 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 27 Dec 2020 17:00:38 +0100 Subject: [PATCH] more fixes --- bsp_linux/InitMission.cpp | 4 ---- fsfwconfig/cdatapool/dataPoolInit.cpp | 5 ----- fsfwconfig/cdatapool/dataPoolInit.h | 13 ------------- 3 files changed, 22 deletions(-) delete mode 100644 fsfwconfig/cdatapool/dataPoolInit.cpp delete mode 100644 fsfwconfig/cdatapool/dataPoolInit.h diff --git a/bsp_linux/InitMission.cpp b/bsp_linux/InitMission.cpp index cf84ab0d..d076c680 100644 --- a/bsp_linux/InitMission.cpp +++ b/bsp_linux/InitMission.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include @@ -29,9 +28,6 @@ ServiceInterfaceStream sif::error("ERROR", true, false, true); ObjectManagerIF *objectManager = nullptr; -//Initialize Data Pool -DataPool dataPool(nullptr); - void InitMission::initMission() { sif::info << "Building global objects.." << std::endl; /* Instantiate global object manager and also create all objects */ diff --git a/fsfwconfig/cdatapool/dataPoolInit.cpp b/fsfwconfig/cdatapool/dataPoolInit.cpp deleted file mode 100644 index fd536af5..00000000 --- a/fsfwconfig/cdatapool/dataPoolInit.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include - -void datapool::dataPoolInit(std::map* poolMap) { - -} diff --git a/fsfwconfig/cdatapool/dataPoolInit.h b/fsfwconfig/cdatapool/dataPoolInit.h deleted file mode 100644 index f97fe7a3..00000000 --- a/fsfwconfig/cdatapool/dataPoolInit.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef FSFWCONFIG_CDATAPOOL_DATAPOOLINIT_H_ -#define FSFWCONFIG_CDATAPOOL_DATAPOOLINIT_H_ - -#include - -namespace datapool{ - void dataPoolInit(std::map* poolMap); - - enum datapoolvariables { - NO_PARAMETER = 0, - }; -} -#endif /* FSFWCONFIG_CDATAPOOL_DATAPOOLINIT_H_ */