Renaming: Timer --> TimerBase, see the next commit

This commit is contained in:
Pavel Kirienko
2014-03-27 11:59:02 +04:00
parent 0dff5b36e4
commit 9476dfbdad
7 changed files with 19 additions and 19 deletions
+6 -6
View File
@@ -14,7 +14,7 @@
namespace uavcan
{
class Timer;
class TimerBase;
struct TimerEvent
{
@@ -28,7 +28,7 @@ struct TimerEvent
};
class Timer : private DeadlineHandler
class TimerBase : private DeadlineHandler
{
MonotonicDuration period_;
@@ -40,7 +40,7 @@ public:
using DeadlineHandler::getDeadline;
using DeadlineHandler::getScheduler;
explicit Timer(INode& node)
explicit TimerBase(INode& node)
: DeadlineHandler(node.getScheduler())
, period_(MonotonicDuration::getInfinite())
{ }
@@ -56,7 +56,7 @@ public:
template <typename Callback>
class TimerEventForwarder : public Timer
class TimerEventForwarder : public TimerBase
{
Callback callback_;
@@ -74,12 +74,12 @@ class TimerEventForwarder : public Timer
public:
explicit TimerEventForwarder(INode& node)
: Timer(node)
: TimerBase(node)
, callback_()
{ }
TimerEventForwarder(INode& node, Callback callback)
: Timer(node)
: TimerBase(node)
, callback_(callback)
{ }
@@ -12,7 +12,7 @@
namespace uavcan
{
class NodeStatusMonitor : protected Timer
class NodeStatusMonitor : protected TimerBase
{
public:
typedef typename StorageType<typename protocol::NodeStatus::FieldTypes::status_code>::Type NodeStatusCode;
@@ -83,7 +83,7 @@ protected:
public:
explicit NodeStatusMonitor(INode& node)
: Timer(node)
: TimerBase(node)
, sub_(node)
{ }
@@ -17,7 +17,7 @@
namespace uavcan
{
class NodeStatusProvider : private Timer
class NodeStatusProvider : private TimerBase
{
typedef MethodBinder<NodeStatusProvider*, void (NodeStatusProvider::*)(const protocol::GlobalDiscoveryRequest&)>
GlobalDiscoveryRequestCallback;
@@ -46,7 +46,7 @@ class NodeStatusProvider : private Timer
public:
NodeStatusProvider(INode& node)
: Timer(node)
: TimerBase(node)
, creation_timestamp_(node.getMonotonicTime())
, node_status_pub_(node)
, gdr_sub_(node)
@@ -11,7 +11,7 @@
namespace uavcan
{
class PanicBroadcaster : private Timer
class PanicBroadcaster : private TimerBase
{
Publisher<protocol::Panic> pub_;
protocol::Panic msg_;
@@ -22,7 +22,7 @@ class PanicBroadcaster : private Timer
public:
PanicBroadcaster(INode& node)
: Timer(node)
: TimerBase(node)
, pub_(node)
{
pub_.setTxTimeout(MonotonicDuration::fromMSec(protocol::Panic::BROADCASTING_INTERVAL_MS - 10));