KSat/fsfw
17
6
Fork 2
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

object manager is now a singleton

Browse Source
This commit is contained in:
Robin Müller
2021-06-05 19:52:38 +02:00
parent e6059812b5
commit 57699cccb7
75 changed files with 321 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
datapoollocal/LocalPoolObjectBase.cpp
+2 -2
View File
@@ -4,7 +4,7 @@
#include "HasLocalDataPoolIF.h"
#include "internal/HasLocalDpIFUserAttorney.h"
#include "../objectmanager/ObjectManagerIF.h"
#include "../objectmanager/ObjectManager.h"
LocalPoolObjectBase::LocalPoolObjectBase(lp_id_t poolId, HasLocalDataPoolIF* hkOwner,
@@ -43,7 +43,7 @@ LocalPoolObjectBase::LocalPoolObjectBase(object_id_t poolOwner, lp_id_t poolId,
"which is the NO_PARAMETER value!\n");
#endif
}
HasLocalDataPoolIF* hkOwner = objectManager->get<HasLocalDataPoolIF>(poolOwner);
HasLocalDataPoolIF* hkOwner = ObjectManager::instance()->get<HasLocalDataPoolIF>(poolOwner);
if(hkOwner == nullptr) {
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "LocalPoolVariable: The supplied pool owner did not implement the correct "