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

Use std::size_t

Browse Source
This commit is contained in:
Ben Dyer
2015-10-25 17:45:34 +11:00
parent 57915e98ba
commit 2d9374044b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/marshal/bit_stream.hpp
+2 -2
View File
@@ -21,8 +21,8 @@ namespace uavcan
* @param dst_org Destination array
* @param dst_offset Bit offset of the first destination byte
*/
void bitarrayCopy(const unsigned char* src_org, size_t src_offset, size_t src_len,
unsigned char* dst_org, size_t dst_offset);
void bitarrayCopy(const unsigned char* src_org, std::size_t src_offset, std::size_t src_len,
unsigned char* dst_org, std::size_t dst_offset);
/**
* This class treats a chunk of memory as an array of bits.
libuavcan/src/marshal/uc_bit_array_copy.cpp
+4 -4
View File
@@ -9,8 +9,8 @@
namespace uavcan
{
void bitarrayCopy(const unsigned char* src, size_t src_offset, size_t src_len,
unsigned char* dst, size_t dst_offset)
void bitarrayCopy(const unsigned char* src, std::size_t src_offset, std::size_t src_len,
unsigned char* dst, std::size_t dst_offset)
{
/*
* Should never be called on a zero-length buffer. The caller will also ensure that the bit
@@ -20,7 +20,7 @@ void bitarrayCopy(const unsigned char* src, size_t src_offset, size_t src_len,
UAVCAN_ASSERT(src_len > 0U);
UAVCAN_ASSERT(src_offset < 8U && dst_offset < 8U);
const size_t last_bit = src_offset + src_len;
const std::size_t last_bit = src_offset + src_len;
while (last_bit - src_offset)
{
const uint8_t src_bit_offset = src_offset % 8U;
@@ -28,7 +28,7 @@ void bitarrayCopy(const unsigned char* src, size_t src_offset, size_t src_len,
// The number of bits to copy
const uint8_t max_offset = uavcan::max(src_bit_offset, dst_bit_offset);
const size_t copy_bits = uavcan::min(last_bit - src_offset, (size_t)(8U - max_offset));
const std::size_t copy_bits = uavcan::min(last_bit - src_offset, (std::size_t)(8U - max_offset));
/*
* The mask indicating which bits of dest to update: