From a4423ff690f8ef88cad0726739a990ad7864bf91 Mon Sep 17 00:00:00 2001
From: Francisco <francisco.paisana@softwareradiosystems.com>
Date: Mon, 15 Feb 2021 19:30:40 +0000
Subject: [PATCH] sched: fix compilation issue for gcc4.8

---
 srsenb/hdr/stack/mac/sched_common.h           | 2 --
 srsenb/src/stack/mac/schedulers/sched_base.cc | 8 +++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srsenb/hdr/stack/mac/sched_common.h b/srsenb/hdr/stack/mac/sched_common.h
index 32a75dbee..a2a93ed38 100644
--- a/srsenb/hdr/stack/mac/sched_common.h
+++ b/srsenb/hdr/stack/mac/sched_common.h
@@ -88,14 +88,12 @@ using prbmask_t = srslte::bounded_bitset<100, true>;
 struct prb_interval;
 struct rbg_interval : public srslte::interval<uint32_t> {
   using interval::interval;
-  rbg_interval(srslte::interval<uint32_t> i) : interval(i) {}
   static rbg_interval rbgmask_to_rbgs(const rbgmask_t& mask);
 };
 
 //! Struct to express a {min,...,max} range of PRBs
 struct prb_interval : public srslte::interval<uint32_t> {
   using interval::interval;
-  prb_interval(srslte::interval<uint32_t> i) : interval(i) {}
   static prb_interval rbgs_to_prbs(const rbg_interval& rbgs, uint32_t cell_nof_prb);
   static prb_interval riv_to_prbs(uint32_t riv, uint32_t nof_prbs, int nof_vrbs = -1);
 };
diff --git a/srsenb/src/stack/mac/schedulers/sched_base.cc b/srsenb/src/stack/mac/schedulers/sched_base.cc
index eec0dbfe7..863c12f8b 100644
--- a/srsenb/src/stack/mac/schedulers/sched_base.cc
+++ b/srsenb/src/stack/mac/schedulers/sched_base.cc
@@ -18,10 +18,12 @@ namespace srsenb {
  * Common UL/DL Helper methods
  ********************************/
 
-template <size_t N>
-srslte::interval<uint32_t> find_contiguous_interval(const srslte::bounded_bitset<N, true>& in_mask, uint32_t max_size)
+template <typename RBMask,
+          typename RBInterval =
+              typename std::conditional<std::is_same<RBMask, prbmask_t>::value, prb_interval, rbg_interval>::type>
+RBInterval find_contiguous_interval(const RBMask& in_mask, uint32_t max_size)
 {
-  srslte::interval<uint32_t> interv, max_interv;
+  RBInterval interv, max_interv;
 
   for (uint32_t n = 0; n < in_mask.size() and interv.length() < max_size; n++) {
     if (not in_mask.test(n) and interv.empty()) {