From 38e43e58adb63e8e0b7ea88569d355e320c29c45 Mon Sep 17 00:00:00 2001
From: Pavel Kirienko <pavel.kirienko@gmail.com>
Date: Mon, 10 Mar 2014 11:01:35 +0400
Subject: [PATCH] Nicer TimerEventForwarder<>

---
 libuavcan/include/uavcan/timer.hpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/libuavcan/include/uavcan/timer.hpp b/libuavcan/include/uavcan/timer.hpp
index ae7f78aa77..fdd2b13379 100644
--- a/libuavcan/include/uavcan/timer.hpp
+++ b/libuavcan/include/uavcan/timer.hpp
@@ -8,6 +8,7 @@
 #include <uavcan/scheduler.hpp>
 #include <uavcan/util/compile_time.hpp>
 #include <uavcan/internal/linked_list.hpp>
+#include <uavcan/internal/fatal_error.hpp>
 
 namespace uavcan
 {
@@ -63,21 +64,25 @@ class TimerEventForwarder : public Timer
     Functor functor_;
 
 public:
+    TimerEventForwarder(Scheduler& node)
+    : Timer(node)
+    , functor_()
+    { }
+
     TimerEventForwarder(Scheduler& node, Functor functor)
     : Timer(node)
     , functor_(functor)
-    {
-        assert(try_implicit_cast<bool>(functor, true));
-    }
+    { }
 
     const Functor& getFunctor() const { return functor_; }
+    void setFunctor(const Functor& functor) { functor_ = functor; }
 
     void onTimerEvent(const TimerEvent& event)
     {
         if (try_implicit_cast<bool>(functor_, true))
             functor_(event);
         else
-            assert(0);
+            handleFatalError("Invalid timer functor");
     }
 };