Merge remote-tracking branch 'sidestream/mohr_introspection' into mohr/introspection
This commit is contained in:
commit
383bafe344
@ -9,7 +9,7 @@ class TemplateAction : public Action {
|
|||||||
#ifdef FSFW_INTROSPECTION
|
#ifdef FSFW_INTROSPECTION
|
||||||
TemplateAction(owner *myOwner, ActionEnum id) : Action(), myOwner(myOwner) {
|
TemplateAction(owner *myOwner, ActionEnum id) : Action(), myOwner(myOwner) {
|
||||||
Action::setEnum(&id);
|
Action::setEnum(&id);
|
||||||
if (myOwner->getActionHelper()->getQueue() == nullptr) {
|
if (myOwner->getActionHelper() == nullptr) {
|
||||||
sif::error
|
sif::error
|
||||||
<< "TemplateAction::TemplateAction: Action instances need to be created (ie located) after the actionHelper instance."
|
<< "TemplateAction::TemplateAction: Action instances need to be created (ie located) after the actionHelper instance."
|
||||||
<< "Program will segfault now..." << std::endl;
|
<< "Program will segfault now..." << std::endl;
|
||||||
@ -26,4 +26,4 @@ class TemplateAction : public Action {
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
owner *myOwner;
|
owner *myOwner;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user