From 291d80119c9acdf93cc7c1e2ba4202a1cefb027b Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Fri, 13 Jul 2018 12:42:54 +0200 Subject: [PATCH] fix conflicts after merging --- lib/include/srslte/common/buffer_pool.h | 3 --- lib/src/upper/rlc_um.cc | 9 --------- 2 files changed, 12 deletions(-) diff --git a/lib/include/srslte/common/buffer_pool.h b/lib/include/srslte/common/buffer_pool.h index 0ffe00cdf..54708b3e1 100644 --- a/lib/include/srslte/common/buffer_pool.h +++ b/lib/include/srslte/common/buffer_pool.h @@ -197,9 +197,6 @@ public: void set_log(srslte::log *log) { this->log = log; } - void set_log(srslte::log *log) { - this->log = log; - } void deallocate(byte_buffer_t *b) { if(!b) { return; diff --git a/lib/src/upper/rlc_um.cc b/lib/src/upper/rlc_um.cc index f676bdfc8..f2f6d65ef 100644 --- a/lib/src/upper/rlc_um.cc +++ b/lib/src/upper/rlc_um.cc @@ -44,16 +44,7 @@ rlc_um::rlc_um(uint32_t queue_len) // Warning: must call stop() to properly deallocate all buffers rlc_um::~rlc_um() { -<<<<<<< HEAD - pthread_mutex_destroy(&mutex); - pool = NULL; - if (mac_timers && reordering_timer) { - mac_timers->timer_release_id(reordering_timer_id); - reordering_timer = NULL; - } -======= stop(); ->>>>>>> 1f7e9187906c824b2092c71374291042e571d631 } void rlc_um::init(srslte::log *log_,