From ad3175a235f124ae3d9e0a843a149475ce4c1a39 Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Wed, 12 Mar 2014 11:28:19 +0400 Subject: [PATCH] GenericSubscriber<>::getFailureCount() made protected - needed for Server<> --- libuavcan/include/uavcan/internal/node/generic_subscriber.hpp | 4 ++-- libuavcan/include/uavcan/subscriber.hpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libuavcan/include/uavcan/internal/node/generic_subscriber.hpp b/libuavcan/include/uavcan/internal/node/generic_subscriber.hpp index c42fefb6bf..a640ce4137 100644 --- a/libuavcan/include/uavcan/internal/node/generic_subscriber.hpp +++ b/libuavcan/include/uavcan/internal/node/generic_subscriber.hpp @@ -199,10 +199,10 @@ protected: } } + uint32_t getFailureCount() const { return failure_count_; } + public: Scheduler& getScheduler() const { return scheduler_; } - - uint32_t getFailureCount() const { return failure_count_; } }; } diff --git a/libuavcan/include/uavcan/subscriber.hpp b/libuavcan/include/uavcan/subscriber.hpp index fd2581ea2e..95386cc90b 100644 --- a/libuavcan/include/uavcan/subscriber.hpp +++ b/libuavcan/include/uavcan/subscriber.hpp @@ -53,6 +53,7 @@ public: } using BaseType::stop; + using BaseType::getFailureCount; }; }