From 2e15514d00634c7129ce5fdfb09cdf7ff111692f Mon Sep 17 00:00:00 2001 From: Francisco Paisana Date: Thu, 2 Apr 2020 17:24:46 +0100 Subject: [PATCH] fix enter/exit calls --- lib/test/common/fsm_test.cc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/test/common/fsm_test.cc b/lib/test/common/fsm_test.cc index 407bb9f87..ee96b6979 100644 --- a/lib/test/common/fsm_test.cc +++ b/lib/test/common/fsm_test.cc @@ -52,11 +52,9 @@ public: class state1 : public srslte::state_t { public: - state1(fsm1* f) - { - test_log->info("fsm1::%s::enter called\n", name()); - f->state1_enter_counter++; - } + state1(fsm1* f) { f->state1_enter_counter++; } + void enter() final { test_log->info("fsm1::%s::enter called\n", name()); } + void exit() final { test_log->info("fsm1::%s::exit called\n", name()); } const char* name() const final { return "state1"; } }; @@ -66,12 +64,13 @@ public: public: struct state_inner : public srslte::state_t { const char* name() const final { return "state_inner"; } - state_inner() { test_log->info("fsm2::%s::enter called\n", name()); } - void exit() final { test_log->info("fsm2::%s::exit called\n", name()); } + void enter() { test_log->info("fsm2::%s::enter called\n", name()); } + void exit() final { test_log->info("fsm2::%s::exit called\n", name()); } }; - fsm2(fsm1* f_) : nested_fsm_t(f_) { test_log->info("%s::enter called\n", name()); } - ~fsm2() { test_log->info("%s::exit called\n", name()); } + fsm2(fsm1* f_) : nested_fsm_t(f_) {} + void enter() final { test_log->info("%s::enter called\n", name()); } + void exit() { test_log->info("%s::exit called\n", name()); } const char* name() const final { return "fsm2"; } protected: