From 1a64c6adad1b8e09ae7e6312a07db37b7a47f376 Mon Sep 17 00:00:00 2001
From: Alejandro Leal Conejos <alejandro.leal@srs.io>
Date: Fri, 8 Oct 2021 12:10:01 +0200
Subject: [PATCH] Enum fixes so clang 12 can build the repo

---
 lib/include/srsran/common/interfaces_common.h | 13 ++++++-------
 lib/include/srsran/phy/channel/channel.h      |  4 ++--
 srsenb/hdr/stack/mac/mac.h                    |  4 ++--
 srsepc/hdr/hss/hss.h                          |  8 ++++----
 srsue/hdr/stack/upper/nas_config.h            |  4 ++--
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/lib/include/srsran/common/interfaces_common.h b/lib/include/srsran/common/interfaces_common.h
index d2372a58d..2a80530ea 100644
--- a/lib/include/srsran/common/interfaces_common.h
+++ b/lib/include/srsran/common/interfaces_common.h
@@ -20,20 +20,20 @@
 
 namespace srsran {
 
-typedef struct {
+struct phy_log_args_t {
   std::string phy_level     = "none";
   std::string phy_lib_level = "none";
   std::string id_preamble   = "";
   int         phy_hex_limit = -1;
-} phy_log_args_t;
+};
 
-typedef struct {
+struct rf_args_band_t {
   float min;
   float max;
-} rf_args_band_t;
+};
 
 // RF/radio args
-typedef struct {
+struct rf_args_t {
   std::string type;
   std::string log_level;
   double      srate_hz;
@@ -56,8 +56,7 @@ typedef struct {
 
   std::array<rf_args_band_t, SRSRAN_MAX_CARRIERS> ch_rx_bands;
   std::array<rf_args_band_t, SRSRAN_MAX_CARRIERS> ch_tx_bands;
-
-} rf_args_t;
+};
 
 struct vnf_args_t {
   std::string type;
diff --git a/lib/include/srsran/phy/channel/channel.h b/lib/include/srsran/phy/channel/channel.h
index 2b73789b8..66da73052 100644
--- a/lib/include/srsran/phy/channel/channel.h
+++ b/lib/include/srsran/phy/channel/channel.h
@@ -28,7 +28,7 @@ namespace srsran {
 class channel
 {
 public:
-  typedef struct {
+  struct args_t {
     // General
     bool enable = false;
 
@@ -58,7 +58,7 @@ public:
     bool     rlf_enable   = false;
     uint32_t rlf_t_on_ms  = 10000;
     uint32_t rlf_t_off_ms = 2000;
-  } args_t;
+  };
 
   channel(const args_t& channel_args, uint32_t _nof_channels, srslog::basic_logger& logger);
   ~channel();
diff --git a/srsenb/hdr/stack/mac/mac.h b/srsenb/hdr/stack/mac/mac.h
index cbb7e4af3..718c1cbd2 100644
--- a/srsenb/hdr/stack/mac/mac.h
+++ b/srsenb/hdr/stack/mac/mac.h
@@ -155,12 +155,12 @@ private:
   const static int NOF_BCCH_DLSCH_MSG = sched_interface::MAX_SIBS;
 
   const static int pcch_payload_buffer_len = 1024;
-  typedef struct {
+  struct common_buffers_t {
     uint8_t                pcch_payload_buffer[pcch_payload_buffer_len] = {};
     srsran_softbuffer_tx_t bcch_softbuffer_tx[NOF_BCCH_DLSCH_MSG]       = {};
     srsran_softbuffer_tx_t pcch_softbuffer_tx                           = {};
     srsran_softbuffer_tx_t rar_softbuffer_tx                            = {};
-  } common_buffers_t;
+  };
 
   std::vector<common_buffers_t> common_buffers;
 
diff --git a/srsepc/hdr/hss/hss.h b/srsepc/hdr/hss/hss.h
index 43e12d28e..46e635686 100644
--- a/srsepc/hdr/hss/hss.h
+++ b/srsepc/hdr/hss/hss.h
@@ -34,15 +34,15 @@
 
 namespace srsepc {
 
-typedef struct {
+struct hss_args_t {
   std::string db_file;
   uint16_t    mcc;
   uint16_t    mnc;
-} hss_args_t;
+};
 
 enum hss_auth_algo { HSS_ALGO_XOR, HSS_ALGO_MILENAGE };
 
-typedef struct {
+struct hss_ue_ctx_t {
   // Members
   std::string        name;
   uint64_t           imsi;
@@ -61,7 +61,7 @@ typedef struct {
   void set_sqn(const uint8_t* sqn_);
   void set_last_rand(const uint8_t* rand_);
   void get_last_rand(uint8_t* rand_);
-} hss_ue_ctx_t;
+};
 
 class hss : public hss_interface_nas
 {
diff --git a/srsue/hdr/stack/upper/nas_config.h b/srsue/hdr/stack/upper/nas_config.h
index 4d6216956..2af8a2fe6 100644
--- a/srsue/hdr/stack/upper/nas_config.h
+++ b/srsue/hdr/stack/upper/nas_config.h
@@ -18,10 +18,10 @@
 
 namespace srsue {
 
-typedef struct {
+struct nas_sim_args_t {
   int airplane_t_on_ms  = -1;
   int airplane_t_off_ms = -1;
-} nas_sim_args_t;
+};
 
 class nas_args_t
 {