From df06443470970606535423a783ca1600946b8566 Mon Sep 17 00:00:00 2001 From: Francisco Paisana Date: Mon, 27 Apr 2020 14:06:33 +0100 Subject: [PATCH] use c++ variadic template instead of variadic function --- lib/include/srslte/common/fsm.h | 3 ++- srsenb/hdr/stack/mac/ue.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/include/srslte/common/fsm.h b/lib/include/srslte/common/fsm.h index 48cd96fd8..b61c0e7fa 100644 --- a/lib/include/srslte/common/fsm.h +++ b/lib/include/srslte/common/fsm.h @@ -199,7 +199,8 @@ struct fsm_helper { fsm_helper::handle_state_change(f, &target_state, &s); return true; } - bool call_react(...) + template + bool call_react(Args...) { f->log_fsm_activity( "FSM \"%s\": Unhandled event caught: \"%s\"\n", get_type_name().c_str(), get_type_name().c_str()); diff --git a/srsenb/hdr/stack/mac/ue.h b/srsenb/hdr/stack/mac/ue.h index ee36c39c5..ca954c4c6 100644 --- a/srsenb/hdr/stack/mac/ue.h +++ b/srsenb/hdr/stack/mac/ue.h @@ -78,7 +78,7 @@ public: bool process_pdus(); uint8_t* request_buffer(const uint32_t ue_cc_idx, const uint32_t tti, const uint32_t len); - void process_pdu(uint8_t* pdu, uint32_t nof_bytes, srslte::pdu_queue::channel_t channel); + void process_pdu(uint8_t* pdu, uint32_t nof_bytes, srslte::pdu_queue::channel_t channel) override; void push_pdu(const uint32_t ue_cc_idx, const uint32_t tti, uint32_t len); void deallocate_pdu(const uint32_t ue_cc_idx, const uint32_t tti);