From 0217bf533271c6e2c73a2058c9ea3fcb97fc8324 Mon Sep 17 00:00:00 2001
From: David Rupprecht <david.rupprecht@softwareradiosystems.com>
Date: Wed, 5 May 2021 11:03:58 +0200
Subject: [PATCH] Fixed name space for rrc ue

---
 lib/test/asn1/srsran_asn1_rrc_ul_dcch_test.cc | 4 ++--
 srsue/hdr/stack/rrc/rrc.h                     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/test/asn1/srsran_asn1_rrc_ul_dcch_test.cc b/lib/test/asn1/srsran_asn1_rrc_ul_dcch_test.cc
index fd99cbe92..a85ce41c6 100644
--- a/lib/test/asn1/srsran_asn1_rrc_ul_dcch_test.cc
+++ b/lib/test/asn1/srsran_asn1_rrc_ul_dcch_test.cc
@@ -52,7 +52,7 @@ int rrc_ue_cap_info_test(srsran::mac_pcap* pcap)
   rrc_logger.set_level(srslog::basic_levels::debug);
   rrc_logger.set_hex_dump_max_size(128);
 
-  rrc_args_t args          = {};
+  srsue::rrc_args_t args   = {};
   args.feature_group       = 0xe6041c00;
   args.nof_supported_bands = 1;
   args.supported_bands[0]  = 8;
@@ -119,7 +119,7 @@ int rrc_ue_cap_info_test(srsran::mac_pcap* pcap)
 
 int pack_fail_test()
 {
-  rrc_args_t args          = {};
+  srsue::rrc_args_t args   = {};
   args.feature_group       = 0xe6041c00;
   args.nof_supported_bands = 1;
   args.supported_bands[0]  = 8;
diff --git a/srsue/hdr/stack/rrc/rrc.h b/srsue/hdr/stack/rrc/rrc.h
index 0f6a3fef4..13b24042a 100644
--- a/srsue/hdr/stack/rrc/rrc.h
+++ b/srsue/hdr/stack/rrc/rrc.h
@@ -31,6 +31,10 @@
 #include <math.h>
 #include <queue>
 
+using srsran::byte_buffer_t;
+
+namespace srsue {
+
 #define SRSRAN_RRC_N_BANDS 43
 typedef struct {
   std::string                             ue_category_str;
@@ -53,10 +57,6 @@ typedef struct {
 #define SRSRAN_RELEASE_MAX 15
 #define SRSRAN_RELEASE_DEFAULT (SRSRAN_RELEASE_MAX)
 
-using srsran::byte_buffer_t;
-
-namespace srsue {
-
 class phy_controller;
 class usim_interface_rrc;
 class gw_interface_rrc;