PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix compilation issue with lack of override keyword and scoping in fsm

This commit is contained in:
Francisco Paisana 2020-04-27 12:49:07 +01:00 committed by Francisco Paisana
parent e1ac6d7cfe
commit 3da8464a21
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/include/srslte/common/fsm.h
View File

@ -243,6 +243,7 @@ protected:
template <typename SubFSM> template <typename SubFSM>
using subfsm_t = nested_fsm_t<SubFSM, Derived>; using subfsm_t = nested_fsm_t<SubFSM, Derived>;
public:
//! get access to derived protected members from the base //! get access to derived protected members from the base
class derived_view : public Derived class derived_view : public Derived
{ {
@ -257,7 +258,6 @@ protected:
using Derived::states; using Derived::states;
}; };
public:
static const bool is_nested = false; static const bool is_nested = false;
template <typename NextState> template <typename NextState>
using to_state = srslte::to_state<NextState>; using to_state = srslte::to_state<NextState>;

28
lib/include/srslte/upper/rlc_tm.h
View File

@ -40,27 +40,27 @@ public:
srsue::rrc_interface_rlc* rrc_, srsue::rrc_interface_rlc* rrc_,
srslte::timer_handler* timers_, srslte::timer_handler* timers_,
uint32_t queue_len = 16); uint32_t queue_len = 16);
~rlc_tm(); ~rlc_tm() override;
bool configure(const rlc_config_t& cnfg) override; bool configure(const rlc_config_t& cnfg) override;
void stop(); void stop() override;
void reestablish(); void reestablish() override;
void empty_queue(); void empty_queue() override;
rlc_mode_t get_mode(); rlc_mode_t get_mode() override;
uint32_t get_bearer(); uint32_t get_bearer() override;
rlc_bearer_metrics_t get_metrics(); rlc_bearer_metrics_t get_metrics() override;
void reset_metrics(); void reset_metrics() override;
// PDCP interface // PDCP interface
void write_sdu(unique_byte_buffer_t sdu, bool blocking); void write_sdu(unique_byte_buffer_t sdu, bool blocking) override;
void discard_sdu(uint32_t discard_sn); void discard_sdu(uint32_t discard_sn) override;
// MAC interface // MAC interface
bool has_data(); bool has_data() override;
uint32_t get_buffer_state(); uint32_t get_buffer_state() override;
int read_pdu(uint8_t* payload, uint32_t nof_bytes); int read_pdu(uint8_t* payload, uint32_t nof_bytes) override;
void write_pdu(uint8_t* payload, uint32_t nof_bytes); void write_pdu(uint8_t* payload, uint32_t nof_bytes) override;
private: private:
byte_buffer_pool* pool = nullptr; byte_buffer_pool* pool = nullptr;