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

Scope hiding fixes

Browse Source
This commit is contained in:
Pavel Kirienko
2014-04-19 16:32:42 +04:00
parent c4c77ea321
commit 799846de02
11 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan_drivers/linux/include/uavcan_linux/socketcan.hpp
+5 -5
View File
@@ -95,10 +95,10 @@ class SocketCanIface : public uavcan::ICanIface
: flags(0)
{ }
TxItem(const uavcan::CanFrame& frame, uavcan::MonotonicTime deadline, uavcan::CanIOFlags flags)
: frame(frame)
, deadline(deadline)
, flags(flags)
TxItem(const uavcan::CanFrame& arg_frame, uavcan::MonotonicTime arg_deadline, uavcan::CanIOFlags arg_flags)
: frame(arg_frame)
, deadline(arg_deadline)
, flags(arg_flags)
{ }
bool operator<(const TxItem& rhs) const { return frame.priorityLowerThan(rhs.frame); }
@@ -190,7 +190,7 @@ class SocketCanIface : public uavcan::ICanIface
struct Control
{
cmsghdr cm;
std::uint8_t control[sizeof(::timeval)];
std::uint8_t data[sizeof(::timeval)];
};
auto control = Control();