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

Minor source reorganization; few dangerous C functions replaced with safer std:: alternatives

Browse Source
This commit is contained in:
Pavel Kirienko
2014-02-01 19:00:05 +04:00
parent b385ffb12e
commit 00b977eb40
9 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/can_driver.hpp
+4 -4
View File
@@ -7,7 +7,7 @@
#include <cassert>
#include <stdint.h>
#include <cstring>
#include <algorithm>
#include <string>
namespace uavcan
@@ -31,7 +31,7 @@ struct CanFrame
: id(0)
, dlc(0)
{
std::memset(data, 0, sizeof(data));
std::fill(data, data + sizeof(data), 0);
}
CanFrame(uint32_t id, const uint8_t* data, unsigned int dlc)
@@ -39,13 +39,13 @@ struct CanFrame
, dlc(dlc)
{
assert(data && dlc <= 8);
std::memmove(this->data, data, dlc);
std::copy(data, data + dlc, this->data);
}
bool operator!=(const CanFrame& rhs) const { return !operator==(rhs); }
bool operator==(const CanFrame& rhs) const
{
return (id == rhs.id) && (dlc == rhs.dlc) && (memcmp(data, rhs.data, dlc) == 0);
return (id == rhs.id) && (dlc == rhs.dlc) && std::equal(data, data + dlc, rhs.data);
}
bool isExtended() const { return id & FLAG_EFF; }