From 199f1c953e4b1df94c96b2795088f3711b67183c Mon Sep 17 00:00:00 2001 From: faluco Date: Wed, 3 Feb 2021 10:26:04 +0100 Subject: [PATCH] Remove unneeded logmap headers. --- lib/include/srslte/common/basic_pnf.h | 1 - lib/include/srslte/common/basic_vnf.h | 1 - lib/include/srslte/common/common_helper.h | 1 - lib/include/srslte/common/fsm.h | 3 ++- lib/include/srslte/common/mac_pcap.h | 2 +- lib/include/srslte/common/network_utils.h | 1 - lib/include/srslte/common/time_prof.h | 3 ++- lib/include/srslte/common/tti_point.h | 3 ++- lib/src/common/basic_vnf.cc | 1 + srsenb/test/mac/sched_sim_ue.h | 1 + 10 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/include/srslte/common/basic_pnf.h b/lib/include/srslte/common/basic_pnf.h index b7cf59b85..db2b0f73d 100644 --- a/lib/include/srslte/common/basic_pnf.h +++ b/lib/include/srslte/common/basic_pnf.h @@ -18,7 +18,6 @@ #include "srslte/adt/choice_type.h" #include "srslte/common/block_queue.h" #include "srslte/common/buffer_pool.h" -#include "srslte/common/logmap.h" #include "srslte/srslog/srslog.h" #include #include diff --git a/lib/include/srslte/common/basic_vnf.h b/lib/include/srslte/common/basic_vnf.h index 686c25dd0..fcd8f48fb 100644 --- a/lib/include/srslte/common/basic_vnf.h +++ b/lib/include/srslte/common/basic_vnf.h @@ -15,7 +15,6 @@ #include "basic_vnf_api.h" #include "common.h" -#include "srslte/common/logmap.h" #include "srslte/common/threads.h" #include "srslte/interfaces/gnb_interfaces.h" #include "srslte/interfaces/ue_nr_interfaces.h" diff --git a/lib/include/srslte/common/common_helper.h b/lib/include/srslte/common/common_helper.h index bac36b581..f915a38bc 100644 --- a/lib/include/srslte/common/common_helper.h +++ b/lib/include/srslte/common/common_helper.h @@ -18,7 +18,6 @@ #ifndef SRSLTE_COMMON_HELPER_H #define SRSLTE_COMMON_HELPER_H -#include "srslte/common/logmap.h" #include "srslte/srslog/srslog.h" #include #include diff --git a/lib/include/srslte/common/fsm.h b/lib/include/srslte/common/fsm.h index 1466fba5e..2915bbf17 100644 --- a/lib/include/srslte/common/fsm.h +++ b/lib/include/srslte/common/fsm.h @@ -15,8 +15,9 @@ #include "srslte/adt/detail/type_utils.h" #include "srslte/adt/move_callback.h" -#include "srslte/common/logmap.h" +#include "srslte/srslog/srslog.h" #include +#include #include #include #include diff --git a/lib/include/srslte/common/mac_pcap.h b/lib/include/srslte/common/mac_pcap.h index d08415f4c..737f2709b 100644 --- a/lib/include/srslte/common/mac_pcap.h +++ b/lib/include/srslte/common/mac_pcap.h @@ -16,12 +16,12 @@ #include "srslte/common/block_queue.h" #include "srslte/common/buffer_pool.h" #include "srslte/common/common.h" -#include "srslte/common/logmap.h" #include "srslte/common/pcap.h" #include "srslte/common/threads.h" #include #include #include + namespace srslte { class mac_pcap : srslte::thread { diff --git a/lib/include/srslte/common/network_utils.h b/lib/include/srslte/common/network_utils.h index bf4616732..454cd0e56 100644 --- a/lib/include/srslte/common/network_utils.h +++ b/lib/include/srslte/common/network_utils.h @@ -14,7 +14,6 @@ #define SRSLTE_RX_SOCKET_HANDLER_H #include "srslte/common/buffer_pool.h" -#include "srslte/common/logmap.h" #include "srslte/common/threads.h" #include diff --git a/lib/include/srslte/common/time_prof.h b/lib/include/srslte/common/time_prof.h index f34d2819f..775afb0f6 100644 --- a/lib/include/srslte/common/time_prof.h +++ b/lib/include/srslte/common/time_prof.h @@ -13,8 +13,9 @@ #ifndef SRSLTE_TIME_PROF_H #define SRSLTE_TIME_PROF_H -#include "srslte/common/logmap.h" +#include "srslte/srslog/srslog.h" #include +#include #ifdef ENABLE_TIMEPROF #define TPROF_ENABLE_DEFAULT true diff --git a/lib/include/srslte/common/tti_point.h b/lib/include/srslte/common/tti_point.h index 3e4fcf3ae..e393337bb 100644 --- a/lib/include/srslte/common/tti_point.h +++ b/lib/include/srslte/common/tti_point.h @@ -13,8 +13,9 @@ #ifndef SRSLTE_TTI_POINT_H #define SRSLTE_TTI_POINT_H -#include "logmap.h" #include "srslte/adt/interval.h" +#include "srslte/common/common.h" +#include "srslte/srslog/srslog.h" #include #include diff --git a/lib/src/common/basic_vnf.cc b/lib/src/common/basic_vnf.cc index bf07c31fd..c752f4841 100644 --- a/lib/src/common/basic_vnf.cc +++ b/lib/src/common/basic_vnf.cc @@ -11,6 +11,7 @@ */ #include "srslte/common/basic_vnf.h" +#include "srslte/common/buffer_pool.h" #include "srslte/interfaces/ue_nr_interfaces.h" #include #include diff --git a/srsenb/test/mac/sched_sim_ue.h b/srsenb/test/mac/sched_sim_ue.h index 2a5319683..009a1221a 100644 --- a/srsenb/test/mac/sched_sim_ue.h +++ b/srsenb/test/mac/sched_sim_ue.h @@ -17,6 +17,7 @@ #include "srslte/interfaces/sched_interface.h" #include "srslte/srslog/srslog.h" #include +#include namespace srsenb {