From 2204cab4c87bf77fac56499bbfae90713de1e575 Mon Sep 17 00:00:00 2001
From: Francisco Paisana <paisanaf@tcd.ie>
Date: Tue, 5 May 2020 18:32:01 +0100
Subject: [PATCH] old gcc version cannot support the detected pattern. Removing
 it

---
 lib/include/srslte/common/fsm.h        | 41 +++++++++++++++++---------
 lib/include/srslte/common/type_utils.h | 31 -------------------
 lib/test/common/fsm_test.cc            |  5 ++--
 3 files changed, 30 insertions(+), 47 deletions(-)

diff --git a/lib/include/srslte/common/fsm.h b/lib/include/srslte/common/fsm.h
index ac3a1befc..1fc1da192 100644
--- a/lib/include/srslte/common/fsm.h
+++ b/lib/include/srslte/common/fsm.h
@@ -97,10 +97,27 @@ using fsm_state_list_type = decltype(std::declval<typename FSM::derived_view>().
 template <typename FSM>
 using fsm_transitions = typename FSM::derived_view::transitions;
 
-template <typename T>
-using enter_op_t = decltype(std::declval<T>().enter(nullptr));
-template <typename T>
-using exit_op_t = decltype(std::declval<T>().exit(nullptr));
+//! Detection of enter/exit methods of a state.
+template <typename FSM, typename State>
+auto call_enter(FSM* f, State* s) -> decltype(s->enter(f), std::true_type{})
+{
+  s->enter(f);
+  return std::true_type{};
+}
+auto call_enter(...) -> std::false_type
+{
+  return {};
+}
+template <typename FSM, typename State>
+auto call_exit(FSM* f, State* s) -> decltype(s->exit(f), std::true_type{})
+{
+  s->exit(f);
+  return std::true_type{};
+}
+auto call_exit(...) -> std::false_type
+{
+  return {};
+}
 
 //! Find State in FSM recursively (e.g. find State in FSM,FSM::parentFSM,FSM::parentFSM::parentFSM,...)
 template <typename State, typename FSM>
@@ -128,8 +145,8 @@ struct state_traits {
   static_assert(FSM::template can_hold_state<State>(), "FSM type does not hold provided State\n");
   using state_t   = State;
   using is_subfsm = std::integral_constant<bool, ::srslte::fsm_details::is_subfsm<State>()>;
-  using has_enter = type_utils::is_detected<enter_op_t, State>;
-  using has_exit  = type_utils::is_detected<exit_op_t, State>;
+  using has_enter = decltype(fsm_details::call_enter((FSM*)nullptr, (State*)nullptr));
+  using has_exit  = decltype(fsm_details::call_exit((FSM*)nullptr, (State*)nullptr));
 
   //! enter new state. enter is called recursively for subFSMs
   static void enter_state(FSM* f, State* s) { enter_(f, s, is_subfsm{}); }
@@ -137,7 +154,7 @@ struct state_traits {
   template <typename DestState>
   static enable_if_fsm_state<FSM, DestState> transit_state(FSM* f)
   {
-    exit_if_exists_(f, &f->states.template get_unchecked<State>(), has_exit{});
+    call_exit(f, &f->states.template get_unchecked<State>());
     f->states.template transit<DestState>();
     state_traits<FSM, DestState>::enter_state(f, &f->states.template get_unchecked<DestState>());
   }
@@ -145,7 +162,7 @@ struct state_traits {
   static disable_if_fsm_state<FSM, DestState> transit_state(FSM* f)
   {
     using parent_state_traits = state_traits<typename FSM::parent_t::derived_view, typename FSM::derived_t>;
-    exit_if_exists_(f, &f->states.template get_unchecked<State>(), has_exit{});
+    call_exit(f, &f->states.template get_unchecked<State>());
     parent_state_traits::template transit_state<DestState>(get_derived(f->parent_fsm()));
   }
 
@@ -157,17 +174,13 @@ private:
     // set default FSM type
     get_derived(s)->states.template transit<init_type>();
     // call FSM enter function
-    enter_if_exists_(f, s, has_enter{});
+    call_enter(f, s);
     // call initial substate enter
     state_traits<typename State::derived_view, init_type>::enter_state(
         get_derived(s), &get_derived(s)->states.template get_unchecked<init_type>());
   }
   //! In case of State is basic state
-  static void enter_(FSM* f, State* s, std::false_type) { enter_if_exists_(f, s, has_enter{}); }
-  static void enter_if_exists_(FSM* f, State* s, std::true_type) { s->enter(f); }
-  static void enter_if_exists_(FSM* f, State* s, std::false_type) {}
-  static void exit_if_exists_(FSM* f, State* s, std::true_type) { s->exit(f); }
-  static void exit_if_exists_(FSM* f, State* s, std::false_type) {}
+  static void enter_(FSM* f, State* s, std::false_type) { call_enter(f, s); }
 };
 
 //! Trigger Event reaction for the first Row for which the Guard passes
diff --git a/lib/include/srslte/common/type_utils.h b/lib/include/srslte/common/type_utils.h
index 9f46e73c5..fd31faa4f 100644
--- a/lib/include/srslte/common/type_utils.h
+++ b/lib/include/srslte/common/type_utils.h
@@ -209,37 +209,6 @@ struct filter<Predicate> {
   using type = type_list<>;
 };
 
-/**************************
- *    Detect Pattern
- *************************/
-
-template <typename...>
-using voider = void;
-
-template <class Default, class AlwaysVoid, template <class...> class Op, class... Args>
-struct detector {
-  using value_t = std::false_type;
-  using type    = Default;
-};
-
-template <class Default, template <class...> class Op, class... Args>
-struct detector<Default, voider<Op<Args...> >, Op, Args...> {
-  using value_t = std::true_type;
-  using type    = Op<Args...>;
-};
-
-template <template <class...> class Op, class... Args>
-using is_detected = typename detector<std::false_type, void, Op, Args...>::value_t;
-
-template <template <class...> class Op, class... Args>
-using detected_t = typename detector<std::false_type, void, Op, Args...>::type;
-
-template <class Default, template <class...> class Op, class... Args>
-using detected_or = detector<Default, void, Op, Args...>;
-
-template <bool Condition, typename T = void>
-using enable_if_t = typename std::enable_if<Condition, T>::type;
-
 } // namespace type_utils
 
 /************************************
diff --git a/lib/test/common/fsm_test.cc b/lib/test/common/fsm_test.cc
index fb1bf9b12..6f3202c7e 100644
--- a/lib/test/common/fsm_test.cc
+++ b/lib/test/common/fsm_test.cc
@@ -171,8 +171,9 @@ static_assert(fsm1::can_hold_state<fsm1::state1>(), "failed can_hold_state check
 static_assert(std::is_same<enable_if_fsm_state<fsm1, fsm1::idle_st>, void>::value, "get state list failed\n");
 static_assert(std::is_same<disable_if_fsm_state<fsm1, fsm1::fsm2::state_inner>, void>::value,
               "get state list failed\n");
-static_assert(type_utils::is_detected<enter_op_t, fsm1::idle_st>::value, "Failed detection of enter method\n");
-static_assert(not type_utils::is_detected<exit_op_t, fsm1::idle_st>::value, "Failed detection of exit method\n");
+static_assert(fsm_details::state_traits<fsm1, fsm1::idle_st>::has_enter::value, "Failed detection of enter method\n");
+static_assert(fsm_details::state_traits<fsm1, fsm1::idle_st>::has_exit::value == false,
+              "Failed detection of exit method\n");
 
 } // namespace fsm_details
 } // namespace srslte