fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-23 17:43:34 +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/include/uavcan/driver/can.hpp
+4 -4
View File
@@ -38,13 +38,13 @@ struct UAVCAN_EXPORT CanFrame
std::fill(data, data + MaxDataLen, 0);
}
CanFrame(uint32_t id, const uint8_t* data, uint8_t data_len)
: id(id)
CanFrame(uint32_t arg_id, const uint8_t* arg_data, uint8_t data_len)
: id(arg_id)
, dlc((data_len > MaxDataLen) ? MaxDataLen : data_len)
{
assert(data != NULL);
assert(arg_data != NULL);
assert(data_len == dlc);
std::copy(data, data + dlc, this->data);
(void)std::copy(arg_data, arg_data + dlc, this->data);
}
bool operator!=(const CanFrame& rhs) const { return !operator==(rhs); }