From cdbf20bae7344cf80bc618357b7c7453360d1ad8 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 4 Oct 2022 10:47:27 +0200 Subject: [PATCH] remove weird prod callback --- src/fsfw/objectmanager/ObjectManager.cpp | 6 ------ src/fsfw/objectmanager/ObjectManager.h | 5 ----- 2 files changed, 11 deletions(-) diff --git a/src/fsfw/objectmanager/ObjectManager.cpp b/src/fsfw/objectmanager/ObjectManager.cpp index ddf5ab80..18c85b46 100644 --- a/src/fsfw/objectmanager/ObjectManager.cpp +++ b/src/fsfw/objectmanager/ObjectManager.cpp @@ -16,11 +16,6 @@ ObjectManager* ObjectManager::instance() { return objManagerInstance; } -void ObjectManager::setObjectFactoryFunction(produce_function_t objFactoryFunc, void* factoryArgs) { - this->objectFactoryFunction = objFactoryFunc; - this->factoryArgs = factoryArgs; -} - ObjectManager::ObjectManager() = default; ObjectManager::~ObjectManager() { @@ -89,7 +84,6 @@ void ObjectManager::initialize() { #endif return; } - objectFactoryFunction(factoryArgs); ReturnValue_t result = returnvalue::FAILED; uint32_t errorCount = 0; for (auto const& it : objectList) { diff --git a/src/fsfw/objectmanager/ObjectManager.h b/src/fsfw/objectmanager/ObjectManager.h index e0e74792..0ef9cae1 100644 --- a/src/fsfw/objectmanager/ObjectManager.h +++ b/src/fsfw/objectmanager/ObjectManager.h @@ -21,7 +21,6 @@ */ class ObjectManager : public ObjectManagerIF { public: - using produce_function_t = void (*)(void* args); /** * Returns the single instance of TaskFactory. @@ -30,8 +29,6 @@ class ObjectManager : public ObjectManagerIF { */ static ObjectManager* instance(); - void setObjectFactoryFunction(produce_function_t prodFunc, void* args); - template T* get(object_id_t id); @@ -54,8 +51,6 @@ class ObjectManager : public ObjectManagerIF { * @param The id of the object to be created. * @return Returns a pointer to the newly created object or NULL. */ - produce_function_t objectFactoryFunction = nullptr; - void* factoryArgs = nullptr; private: ObjectManager();