From 19a043683c3d47755ca64a323bbcdc8e3eb243cb Mon Sep 17 00:00:00 2001 From: Francisco Date: Mon, 15 Mar 2021 20:11:21 +0000 Subject: [PATCH] bugfix - fix compilation issue in gcc10. The interfaces don't have virtual dtors --- srsenb/test/mac/sched_test_common.cc | 10 ---------- srsenb/test/mac/sched_test_common.h | 12 +++++++++++- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/srsenb/test/mac/sched_test_common.cc b/srsenb/test/mac/sched_test_common.cc index 98668c053..140de9924 100644 --- a/srsenb/test/mac/sched_test_common.cc +++ b/srsenb/test/mac/sched_test_common.cc @@ -17,7 +17,6 @@ #include "sched_common_test_suite.h" #include "sched_ue_ded_test_suite.h" #include "srslte/common/test_common.h" -#include "srslte/interfaces/enb_rrc_interfaces.h" using namespace srsenb; @@ -43,15 +42,6 @@ std::default_random_engine& ::srsenb::get_rand_gen() return rand_gen; } -struct rrc_dummy : public rrc_interface_mac { -public: - int add_user(uint16_t rnti, const sched_interface::ue_cfg_t& init_ue_cfg) { return SRSLTE_SUCCESS; } - void upd_user(uint16_t new_rnti, uint16_t old_rnti) {} - void set_activity_user(uint16_t rnti) {} - bool is_paging_opportunity(uint32_t tti, uint32_t* payload_len) { return false; } - uint8_t* read_pdu_bcch_dlsch(const uint8_t enb_cc_idx, const uint32_t sib_index) { return nullptr; } -}; - /*********************** * User State Tester ***********************/ diff --git a/srsenb/test/mac/sched_test_common.h b/srsenb/test/mac/sched_test_common.h index 59ac21e31..a53aa5b35 100644 --- a/srsenb/test/mac/sched_test_common.h +++ b/srsenb/test/mac/sched_test_common.h @@ -16,6 +16,7 @@ #include "sched_sim_ue.h" #include "sched_test_utils.h" #include "srsenb/hdr/stack/mac/sched.h" +#include "srslte/interfaces/enb_rrc_interfaces.h" #include "srslte/srslog/srslog.h" #include @@ -29,6 +30,15 @@ void set_randseed(uint64_t seed); float randf(); std::default_random_engine& get_rand_gen(); +struct rrc_dummy : public rrc_interface_mac { +public: + int add_user(uint16_t rnti, const sched_interface::ue_cfg_t& init_ue_cfg) { return SRSLTE_SUCCESS; } + void upd_user(uint16_t new_rnti, uint16_t old_rnti) {} + void set_activity_user(uint16_t rnti) {} + bool is_paging_opportunity(uint32_t tti, uint32_t* payload_len) { return false; } + uint8_t* read_pdu_bcch_dlsch(const uint8_t enb_cc_idx, const uint32_t sib_index) { return nullptr; } +}; + /************************** * Testers *************************/ @@ -115,7 +125,7 @@ protected: virtual void new_test_tti(); virtual void before_sched() {} - std::unique_ptr rrc_ptr; + std::unique_ptr rrc_ptr; }; } // namespace srsenb