From e42449532b61a99b31e83e38e7278801639eceaa Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Wed, 7 Aug 2019 14:32:14 +0200 Subject: [PATCH] fix wrong namespace definition in various places --- lib/include/srslte/common/buffer_pool.h | 2 +- lib/include/srslte/common/log_filter.h | 2 +- lib/include/srslte/common/rlc_pcap.h | 2 +- lib/include/srslte/common/tti_sync.h | 4 ++-- lib/include/srslte/upper/rlc.h | 3 +-- lib/include/srslte/upper/rlc_tm.h | 3 +-- lib/include/srslte/upper/rlc_um.h | 3 +-- lib/src/common/buffer_pool.cc | 4 ++-- lib/src/common/log_filter.cc | 2 +- lib/src/common/logger_file.cc | 2 +- lib/src/common/security.cc | 3 +-- lib/src/upper/pdcp.cc | 2 +- lib/src/upper/rlc_tm.cc | 2 +- lib/src/upper/rlc_um.cc | 2 +- lib/test/asn1/srslte_asn1_rrc_dl_ccch_test.cc | 1 - lib/test/asn1/srslte_asn1_rrc_dl_dcch_test.cc | 1 - lib/test/asn1/srslte_asn1_rrc_ul_dcch_test.cc | 2 +- lib/test/upper/rlc_common_test.cc | 3 +-- lib/test/upper/rlc_um_data_test.cc | 2 -- 19 files changed, 18 insertions(+), 27 deletions(-) diff --git a/lib/include/srslte/common/buffer_pool.h b/lib/include/srslte/common/buffer_pool.h index 85d94f962..b3fe76bc7 100644 --- a/lib/include/srslte/common/buffer_pool.h +++ b/lib/include/srslte/common/buffer_pool.h @@ -242,6 +242,6 @@ allocate_unique_buffer(byte_buffer_pool& pool, const char* debug_name, bool bloc return std::move(unique_byte_buffer_t(pool.allocate(debug_name, blocking), byte_buffer_deleter(&pool))); } -} // namespace srsue +} // namespace srslte #endif // SRSLTE_BUFFER_POOL_H diff --git a/lib/include/srslte/common/log_filter.h b/lib/include/srslte/common/log_filter.h index 2cb113cb8..58a7dba6a 100644 --- a/lib/include/srslte/common/log_filter.h +++ b/lib/include/srslte/common/log_filter.h @@ -94,6 +94,6 @@ protected: std::string hex_string(const uint8_t *hex, int size); }; -} // namespace srsue +} // namespace srslte #endif // SRSLTE_LOG_FILTER_H diff --git a/lib/include/srslte/common/rlc_pcap.h b/lib/include/srslte/common/rlc_pcap.h index 6166a1f66..dffa01b50 100644 --- a/lib/include/srslte/common/rlc_pcap.h +++ b/lib/include/srslte/common/rlc_pcap.h @@ -55,6 +55,6 @@ private: uint16_t channel_id); }; -} // namespace srsue +} // namespace srslte #endif // RLCPCAP_H diff --git a/lib/include/srslte/common/tti_sync.h b/lib/include/srslte/common/tti_sync.h index b73acb342..1f91dcf75 100644 --- a/lib/include/srslte/common/tti_sync.h +++ b/lib/include/srslte/common/tti_sync.h @@ -68,8 +68,8 @@ class tti_sync uint32_t modulus; uint32_t producer_cntr; uint32_t consumer_cntr; -}; +}; -} // namespace srsue +} // namespace srslte #endif // SRSLTE_TTI_SYNC_H diff --git a/lib/include/srslte/upper/rlc.h b/lib/include/srslte/upper/rlc.h index 48457a1ef..ea9ca37e0 100644 --- a/lib/include/srslte/upper/rlc.h +++ b/lib/include/srslte/upper/rlc.h @@ -109,7 +109,6 @@ private: bool valid_lcid_mrb(uint32_t lcid); }; -} // namespace srsue - +} // namespace srslte #endif // SRSLTE_RLC_H diff --git a/lib/include/srslte/upper/rlc_tm.h b/lib/include/srslte/upper/rlc_tm.h index 107b1310b..23dda1f82 100644 --- a/lib/include/srslte/upper/rlc_tm.h +++ b/lib/include/srslte/upper/rlc_tm.h @@ -78,7 +78,6 @@ private: rlc_tx_queue ul_queue; }; -} // namespace srsue - +} // namespace srslte #endif // SRSLTE_RLC_TM_H diff --git a/lib/include/srslte/upper/rlc_um.h b/lib/include/srslte/upper/rlc_um.h index 26cc41f70..b40769147 100644 --- a/lib/include/srslte/upper/rlc_um.h +++ b/lib/include/srslte/upper/rlc_um.h @@ -225,7 +225,6 @@ uint32_t rlc_um_packed_length(rlc_umd_pdu_header_t *header); bool rlc_um_start_aligned(uint8_t fi); bool rlc_um_end_aligned(uint8_t fi); -} // namespace srsue - +} // namespace srslte #endif // SRSLTE_RLC_UM_H diff --git a/lib/src/common/buffer_pool.cc b/lib/src/common/buffer_pool.cc index 30312bdb7..a0ce2b828 100644 --- a/lib/src/common/buffer_pool.cc +++ b/lib/src/common/buffer_pool.cc @@ -49,5 +49,5 @@ void byte_buffer_pool::cleanup(void) } pthread_mutex_unlock(&instance_mutex); } - -} // namespace srsue + +} // namespace srslte diff --git a/lib/src/common/log_filter.cc b/lib/src/common/log_filter.cc index 0808a265e..16788c205 100644 --- a/lib/src/common/log_filter.cc +++ b/lib/src/common/log_filter.cc @@ -297,4 +297,4 @@ std::string log_filter::hex_string(const uint8_t *hex, int size) return ss.str(); } -} // namespace srsue +} // namespace srslte diff --git a/lib/src/common/logger_file.cc b/lib/src/common/logger_file.cc index b0f082062..0e89ff360 100644 --- a/lib/src/common/logger_file.cc +++ b/lib/src/common/logger_file.cc @@ -121,4 +121,4 @@ void logger_file::flush() { } } -} // namespace srsue +} // namespace srslte diff --git a/lib/src/common/security.cc b/lib/src/common/security.cc index ba2c5d8d3..9bf21766e 100644 --- a/lib/src/common/security.cc +++ b/lib/src/common/security.cc @@ -290,5 +290,4 @@ uint8_t security_milenage_f5_star( uint8_t *k, ak); } - -} // namespace srsue +} // namespace srslte diff --git a/lib/src/upper/pdcp.cc b/lib/src/upper/pdcp.cc index 390913554..2b82e8cc7 100644 --- a/lib/src/upper/pdcp.cc +++ b/lib/src/upper/pdcp.cc @@ -314,4 +314,4 @@ bool pdcp::valid_mch_lcid(uint32_t lcid) return true; } -} // namespace srsue +} // namespace srslte diff --git a/lib/src/upper/rlc_tm.cc b/lib/src/upper/rlc_tm.cc index bcc6757fc..360db02bb 100644 --- a/lib/src/upper/rlc_tm.cc +++ b/lib/src/upper/rlc_tm.cc @@ -193,4 +193,4 @@ void rlc_tm::write_pdu(uint8_t *payload, uint32_t nof_bytes) } } -} // namespace srsue +} // namespace srslte diff --git a/lib/src/upper/rlc_um.cc b/lib/src/upper/rlc_um.cc index aa059d24a..79e3d74fd 100644 --- a/lib/src/upper/rlc_um.cc +++ b/lib/src/upper/rlc_um.cc @@ -1077,4 +1077,4 @@ bool rlc_um_end_aligned(uint8_t fi) return (fi == RLC_FI_FIELD_START_AND_END_ALIGNED || fi == RLC_FI_FIELD_NOT_START_ALIGNED); } -} // namespace srsue +} // namespace srslte diff --git a/lib/test/asn1/srslte_asn1_rrc_dl_ccch_test.cc b/lib/test/asn1/srslte_asn1_rrc_dl_ccch_test.cc index cf35bc7cf..c074d3432 100644 --- a/lib/test/asn1/srslte_asn1_rrc_dl_ccch_test.cc +++ b/lib/test/asn1/srslte_asn1_rrc_dl_ccch_test.cc @@ -19,7 +19,6 @@ * */ -#include "../../../srsue/hdr/stack/rrc/rrc.h" #include "srslte/asn1/rrc_asn1.h" #include "srslte/common/bcd_helpers.h" #include "srslte/common/log_filter.h" diff --git a/lib/test/asn1/srslte_asn1_rrc_dl_dcch_test.cc b/lib/test/asn1/srslte_asn1_rrc_dl_dcch_test.cc index e20c6d770..3b0e9b1eb 100644 --- a/lib/test/asn1/srslte_asn1_rrc_dl_dcch_test.cc +++ b/lib/test/asn1/srslte_asn1_rrc_dl_dcch_test.cc @@ -19,7 +19,6 @@ * */ -#include "../../../srsue/hdr/stack/rrc/rrc.h" #include "srslte/asn1/rrc_asn1.h" #include "srslte/common/bcd_helpers.h" #include "srslte/common/log_filter.h" diff --git a/lib/test/asn1/srslte_asn1_rrc_ul_dcch_test.cc b/lib/test/asn1/srslte_asn1_rrc_ul_dcch_test.cc index df6d01223..f9377806c 100644 --- a/lib/test/asn1/srslte_asn1_rrc_ul_dcch_test.cc +++ b/lib/test/asn1/srslte_asn1_rrc_ul_dcch_test.cc @@ -19,7 +19,7 @@ * */ -#include "../../../srsue/hdr/stack/rrc/rrc.h" +#include "../../../srsue/hdr/stack/rrc/rrc.h" // for rrc_args_t #include "srslte/asn1/rrc_asn1.h" #include "srslte/common/bcd_helpers.h" #include "srslte/common/log_filter.h" diff --git a/lib/test/upper/rlc_common_test.cc b/lib/test/upper/rlc_common_test.cc index d6cbc5fd1..d54261907 100644 --- a/lib/test/upper/rlc_common_test.cc +++ b/lib/test/upper/rlc_common_test.cc @@ -35,7 +35,6 @@ #define NBUFS 5 using namespace srslte; -using namespace srsue; using namespace asn1::rrc; class mac_dummy_timers : public srslte::mac_interface_timers @@ -50,7 +49,7 @@ private: srslte::timers::timer t; }; -class rlc_tester : public pdcp_interface_rlc, public rrc_interface_rlc +class rlc_tester : public srsue::pdcp_interface_rlc, public srsue::rrc_interface_rlc { public: rlc_tester() diff --git a/lib/test/upper/rlc_um_data_test.cc b/lib/test/upper/rlc_um_data_test.cc index 8ee7f7604..f70dacefe 100644 --- a/lib/test/upper/rlc_um_data_test.cc +++ b/lib/test/upper/rlc_um_data_test.cc @@ -31,8 +31,6 @@ uint32_t PDU1_LEN = 2; uint8_t pdu2[] = {0x1C ,0xE1 ,0x06 ,0x80}; uint32_t PDU2_LEN = 4; -using namespace srsue; - int main(int argc, char **argv) { srslte::rlc_umd_pdu_header_t h; srslte::byte_buffer_t b1,b2;