From 701f2a07e113b2c889dbaa37abc39b5ef79ee734 Mon Sep 17 00:00:00 2001
From: Pavel Kirienko <pavel.kirienko@gmail.com>
Date: Thu, 27 Mar 2014 22:24:13 +0400
Subject: [PATCH] ServiceClient incapsulation fix

---
 libuavcan/include/uavcan/node/service_client.hpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libuavcan/include/uavcan/node/service_client.hpp b/libuavcan/include/uavcan/node/service_client.hpp
index 4d639186ef..e322eba76c 100644
--- a/libuavcan/include/uavcan/node/service_client.hpp
+++ b/libuavcan/include/uavcan/node/service_client.hpp
@@ -62,7 +62,7 @@ template <typename DataType_, typename Callback = void (*)(const ServiceCallResu
 class ServiceClient
     : public GenericSubscriber<DataType_, typename DataType_::Response,
                                typename ServiceResponseTransferListenerInstantiationHelper<DataType_>::Type >
-    , public DeadlineHandler
+    , protected DeadlineHandler
 {
 public:
     typedef DataType_ DataType;
@@ -275,6 +275,8 @@ public:
         publisher_.setTxTimeout(timeout);
         request_timeout_ = std::max(timeout, publisher_.getTxTimeout());  // No less than TX timeout
     }
+
+    using DeadlineHandler::getDeadline;
 };
 
 }