From 179ff361115b1c371d16bbf757040c6d05dd4400 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Wed, 22 Dec 2021 01:43:22 +0100 Subject: [PATCH] Inline another function, in EngineImpl::shutdown --- src/kernel/EngineImpl.cpp | 3 ++- src/kernel/EngineImpl.hpp | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp index 15fb9f4672..5e3dfeb19e 100644 --- a/src/kernel/EngineImpl.cpp +++ b/src/kernel/EngineImpl.cpp @@ -329,7 +329,8 @@ void EngineImpl::shutdown() instance_->empty_trash(); /* Let's free maestro now */ - instance_->destroy_maestro(); + delete instance_->maestro_; + instance_->maestro_ = nullptr; /* Finish context module and SURF */ instance_->destroy_context_factory(); diff --git a/src/kernel/EngineImpl.hpp b/src/kernel/EngineImpl.hpp index ba9ad2cc39..ed0c976bb9 100644 --- a/src/kernel/EngineImpl.hpp +++ b/src/kernel/EngineImpl.hpp @@ -100,11 +100,6 @@ public: bool is_maestro(const actor::ActorImpl* actor) const { return actor == maestro_; } void set_maestro(actor::ActorImpl* actor) { maestro_ = actor; } actor::ActorImpl* get_maestro() const { return maestro_; } - void destroy_maestro() - { - delete maestro_; - maestro_ = nullptr; - } context::ContextFactory* get_context_factory() const { return context_factory_; } void set_context_factory(context::ContextFactory* factory) { context_factory_ = factory; } -- 2.20.1