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

Compilation error fixes, thanks GCC 4.8

Browse Source
This commit is contained in:
Pavel Kirienko
2014-04-02 14:12:21 +04:00
parent 9e91cd1e7c
commit e485541c2e
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/marshal/array.hpp
+1 -1
View File
@@ -167,7 +167,7 @@ public:
return reinterpret_cast<const char*>(data_);
}
ValueType& at(SizeType pos) { return data_[validateRange(pos)]; }
ValueType& at(SizeType pos) { return data_[Base::validateRange(pos)]; }
const ValueType& at(SizeType pos) const { return data_[Base::validateRange(pos)]; }
ValueType& operator[](SizeType pos) { return at(pos); }
libuavcan/include/uavcan/node/publisher.hpp
+3 -3
View File
@@ -29,12 +29,12 @@ public:
int broadcast(const DataType& message)
{
return publish(message, TransferTypeMessageBroadcast, NodeID::Broadcast);
return BaseType::publish(message, TransferTypeMessageBroadcast, NodeID::Broadcast);
}
int broadcast(const DataType& message, TransferID tid)
{
return publish(message, TransferTypeMessageBroadcast, NodeID::Broadcast, tid);
return BaseType::publish(message, TransferTypeMessageBroadcast, NodeID::Broadcast, tid);
}
int unicast(const DataType& message, NodeID dst_node_id)
@@ -44,7 +44,7 @@ public:
assert(0);
return -ErrInvalidParam;
}
return publish(message, TransferTypeMessageUnicast, dst_node_id);
return BaseType::publish(message, TransferTypeMessageUnicast, dst_node_id);
}
static MonotonicDuration getDefaultTxTimeout() { return MonotonicDuration::fromMSec(5); } // 5 ms --> 200 Hz max