Action: Fix incorrect handling of inherited virtual functions

This commit is contained in:
Léo Lam
2020-12-28 21:20:02 +01:00
parent fcc062ec30
commit 56e1c0cfd2
1469 changed files with 215 additions and 11789 deletions
@@ -7,7 +7,7 @@ ForkTimerForceResetCondition::ForkTimerForceResetCondition(const InitArg& arg) :
ForkTimerForceResetCondition::~ForkTimerForceResetCondition() = default;
bool ForkTimerForceResetCondition::init_(sead::Heap* heap) {
return ForkTimerBase::init_(heap); // NOLINT(bugprone-parent-virtual-call)
return ForkTimer::init_(heap);
}
void ForkTimerForceResetCondition::enter_(ksys::act::ai::InlineParamPack* params) {
@@ -15,7 +15,7 @@ void ForkTimerForceResetCondition::enter_(ksys::act::ai::InlineParamPack* params
}
void ForkTimerForceResetCondition::leave_() {
ForkTimerBase::leave_(); // NOLINT(bugprone-parent-virtual-call)
ForkTimer::leave_();
}
void ForkTimerForceResetCondition::loadParams_() {