From 3da8464a211e7bd96d83d672ab9cffdb31afa79e Mon Sep 17 00:00:00 2001
From: Francisco Paisana <paisanaf@tcd.ie>
Date: Mon, 27 Apr 2020 12:49:07 +0100
Subject: [PATCH] fix compilation issue with lack of override keyword and
 scoping in fsm

---
 lib/include/srslte/common/fsm.h   |  2 +-
 lib/include/srslte/upper/rlc_tm.h | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/include/srslte/common/fsm.h b/lib/include/srslte/common/fsm.h
index 77b7c5c40..48cd96fd8 100644
--- a/lib/include/srslte/common/fsm.h
+++ b/lib/include/srslte/common/fsm.h
@@ -243,6 +243,7 @@ protected:
   template <typename SubFSM>
   using subfsm_t = nested_fsm_t<SubFSM, Derived>;
 
+public:
   //! get access to derived protected members from the base
   class derived_view : public Derived
   {
@@ -257,7 +258,6 @@ protected:
     using Derived::states;
   };
 
-public:
   static const bool is_nested = false;
   template <typename NextState>
   using to_state = srslte::to_state<NextState>;
diff --git a/lib/include/srslte/upper/rlc_tm.h b/lib/include/srslte/upper/rlc_tm.h
index 0ddf32fea..e606267d2 100644
--- a/lib/include/srslte/upper/rlc_tm.h
+++ b/lib/include/srslte/upper/rlc_tm.h
@@ -40,27 +40,27 @@ public:
          srsue::rrc_interface_rlc*  rrc_,
          srslte::timer_handler*     timers_,
          uint32_t                   queue_len = 16);
-  ~rlc_tm();
+  ~rlc_tm() override;
   bool configure(const rlc_config_t& cnfg) override;
-  void stop();
-  void reestablish();
-  void empty_queue();
+  void stop() override;
+  void reestablish() override;
+  void empty_queue() override;
 
-  rlc_mode_t get_mode();
-  uint32_t   get_bearer();
+  rlc_mode_t get_mode() override;
+  uint32_t   get_bearer() override;
 
-  rlc_bearer_metrics_t get_metrics();
-  void                 reset_metrics();
+  rlc_bearer_metrics_t get_metrics() override;
+  void                 reset_metrics() override;
 
   // PDCP interface
-  void write_sdu(unique_byte_buffer_t sdu, bool blocking);
-  void discard_sdu(uint32_t discard_sn);
+  void write_sdu(unique_byte_buffer_t sdu, bool blocking) override;
+  void discard_sdu(uint32_t discard_sn) override;
 
   // MAC interface
-  bool     has_data();
-  uint32_t get_buffer_state();
-  int      read_pdu(uint8_t* payload, uint32_t nof_bytes);
-  void     write_pdu(uint8_t* payload, uint32_t nof_bytes);
+  bool     has_data() override;
+  uint32_t get_buffer_state() override;
+  int      read_pdu(uint8_t* payload, uint32_t nof_bytes) override;
+  void     write_pdu(uint8_t* payload, uint32_t nof_bytes) override;
 
 private:
   byte_buffer_pool*          pool = nullptr;