From 315c5de06ca43d9ba58b8e799ccfc1e8905c45a2 Mon Sep 17 00:00:00 2001 From: yagoda Date: Fri, 16 Feb 2018 13:51:32 +0000 Subject: [PATCH 1/2] fixing type mismatch error in phy.h --- srsue/hdr/phy/phy.h | 4 ++-- srsue/hdr/ue.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srsue/hdr/phy/phy.h b/srsue/hdr/phy/phy.h index 53d4f6e13..a29480ad4 100644 --- a/srsue/hdr/phy/phy.h +++ b/srsue/hdr/phy/phy.h @@ -53,7 +53,7 @@ public: bool init(srslte::radio_multi *radio_handler, mac_interface_phy *mac, rrc_interface_phy *rrc, - std::vector log_vec, + std::vector log_vec, phy_args_t *args = NULL); void stop(); @@ -159,7 +159,7 @@ private: const static int WORKERS_THREAD_PRIO = 0; srslte::radio_multi *radio_handler; - std::vector log_vec; + std::vector log_vec; srslte::log *log_h; srslte::log *log_phy_lib_h; srsue::mac_interface_phy *mac; diff --git a/srsue/hdr/ue.h b/srsue/hdr/ue.h index 763531261..e36277461 100644 --- a/srsue/hdr/ue.h +++ b/srsue/hdr/ue.h @@ -101,7 +101,7 @@ private: srslte::logger *logger; // rf_log is on ue_base - std::vector phy_log; + std::vector phy_log; srslte::log_filter mac_log; srslte::log_filter rlc_log; srslte::log_filter pdcp_log; From 79e59f1bf85af1bb01fca1b50afa03e00267450d Mon Sep 17 00:00:00 2001 From: Ismael Gomez Date: Fri, 16 Feb 2018 15:25:53 +0100 Subject: [PATCH 2/2] Missed headers in previous commit --- srsue/hdr/phy/phy.h | 4 ++-- srsue/hdr/ue.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srsue/hdr/phy/phy.h b/srsue/hdr/phy/phy.h index 53d4f6e13..a29480ad4 100644 --- a/srsue/hdr/phy/phy.h +++ b/srsue/hdr/phy/phy.h @@ -53,7 +53,7 @@ public: bool init(srslte::radio_multi *radio_handler, mac_interface_phy *mac, rrc_interface_phy *rrc, - std::vector log_vec, + std::vector log_vec, phy_args_t *args = NULL); void stop(); @@ -159,7 +159,7 @@ private: const static int WORKERS_THREAD_PRIO = 0; srslte::radio_multi *radio_handler; - std::vector log_vec; + std::vector log_vec; srslte::log *log_h; srslte::log *log_phy_lib_h; srsue::mac_interface_phy *mac; diff --git a/srsue/hdr/ue.h b/srsue/hdr/ue.h index 763531261..e36277461 100644 --- a/srsue/hdr/ue.h +++ b/srsue/hdr/ue.h @@ -101,7 +101,7 @@ private: srslte::logger *logger; // rf_log is on ue_base - std::vector phy_log; + std::vector phy_log; srslte::log_filter mac_log; srslte::log_filter rlc_log; srslte::log_filter pdcp_log;