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

try_implicit_cast<>() --> coerceOrFallback<>()

Browse Source
This commit is contained in:
Pavel Kirienko
2015-06-05 15:21:05 +03:00
parent 1f1679c75d
commit 8ab48f61e7
9 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/node/service_client.hpp
+2 -2
View File
@@ -405,7 +405,7 @@ public:
template <typename DataType_, typename Callback_, unsigned NumStaticCalls_>
void ServiceClient<DataType_, Callback_, NumStaticCalls_>::invokeCallback(ServiceCallResultType& result)
{
if (try_implicit_cast<bool>(callback_, true))
if (coerceOrFallback<bool>(callback_, true))
{
callback_(result);
}
@@ -496,7 +496,7 @@ template <typename DataType_, typename Callback_, unsigned NumStaticCalls_>
int ServiceClient<DataType_, Callback_, NumStaticCalls_>::call(NodeID server_node_id, const RequestType& request,
ServiceCallID& out_call_id)
{
if (!try_implicit_cast<bool>(callback_, true))
if (!coerceOrFallback<bool>(callback_, true))
{
UAVCAN_TRACE("ServiceClient", "Invalid callback");
return -ErrInvalidConfiguration;
libuavcan/include/uavcan/node/service_server.hpp
+2 -2
View File
@@ -127,7 +127,7 @@ private:
ServiceResponseDataStructure<ResponseType> response;
if (try_implicit_cast<bool>(callback_, true))
if (coerceOrFallback<bool>(callback_, true))
{
UAVCAN_ASSERT(response.isResponseEnabled()); // Enabled by default
callback_(request, response);
@@ -174,7 +174,7 @@ public:
{
stop();
if (!try_implicit_cast<bool>(callback, true))
if (!coerceOrFallback<bool>(callback, true))
{
UAVCAN_TRACE("ServiceServer", "Invalid callback");
return -ErrInvalidParam;
libuavcan/include/uavcan/node/subscriber.hpp
+2 -2
View File
@@ -72,7 +72,7 @@ private:
virtual void handleReceivedDataStruct(ReceivedDataStructure<DataType_>& msg)
{
if (try_implicit_cast<bool>(callback_, true))
if (coerceOrFallback<bool>(callback_, true))
{
callback_(msg);
}
@@ -101,7 +101,7 @@ public:
{
stop();
if (!try_implicit_cast<bool>(callback, true))
if (!coerceOrFallback<bool>(callback, true))
{
UAVCAN_TRACE("Subscriber", "Invalid callback");
return -ErrInvalidParam;
libuavcan/include/uavcan/node/timer.hpp
+1 -1
View File
@@ -103,7 +103,7 @@ private:
virtual void handleTimerEvent(const TimerEvent& event)
{
if (try_implicit_cast<bool>(callback_, true))
if (coerceOrFallback<bool>(callback_, true))
{
callback_(event);
}