fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-23 01:43:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

ServiceClient incapsulation fix

Browse Source
This commit is contained in:
Pavel Kirienko
2014-03-27 22:24:13 +04:00
parent 159fda99db
commit 701f2a07e1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/node/service_client.hpp
+3 -1
View File
@@ -62,7 +62,7 @@ template <typename DataType_, typename Callback = void (*)(const ServiceCallResu
class ServiceClient class ServiceClient
: public GenericSubscriber<DataType_, typename DataType_::Response, : public GenericSubscriber<DataType_, typename DataType_::Response,
typename ServiceResponseTransferListenerInstantiationHelper<DataType_>::Type > typename ServiceResponseTransferListenerInstantiationHelper<DataType_>::Type >
, public DeadlineHandler , protected DeadlineHandler
{ {
public: public:
typedef DataType_ DataType; typedef DataType_ DataType;
@@ -275,6 +275,8 @@ public:
publisher_.setTxTimeout(timeout); publisher_.setTxTimeout(timeout);
request_timeout_ = std::max(timeout, publisher_.getTxTimeout()); // No less than TX timeout request_timeout_ = std::max(timeout, publisher_.getTxTimeout()); // No less than TX timeout
} }
using DeadlineHandler::getDeadline;
}; };
} }