niklas/rmw_cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix MSBuild warnings C4146 and C4267

Browse source 
Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
This commit is contained in:
Emerson Knapp 2020-02-07 12:34:34 -08:00 • committed by eboasson
parent 18317eff6c
commit 4209d7654b
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rmw_cyclonedds_cpp/src/serdata.cpp
View file

@ -112,7 +112,7 @@ void * create_response_type_support(
static uint32_t serdata_rmw_size(const struct ddsi_serdata * dcmn) static uint32_t serdata_rmw_size(const struct ddsi_serdata * dcmn)
{ {
size_t size = static_cast<const serdata_rmw *>(dcmn)->size(); size_t size = static_cast<const serdata_rmw *>(dcmn)->size();
uint32_t size_u32(size); uint32_t size_u32 = static_cast<uint32_t>(size);
assert(size == size_u32); assert(size == size_u32);
return size_u32; return size_u32;
} }
@ -504,7 +504,7 @@ void serdata_rmw::resize(size_t requested_size)
/* FIXME: CDR padding in DDSI makes me do this to avoid reading beyond the bounds /* FIXME: CDR padding in DDSI makes me do this to avoid reading beyond the bounds
when copying data to network. Should fix Cyclone to handle that more elegantly. */ when copying data to network. Should fix Cyclone to handle that more elegantly. */
size_t n_pad_bytes = (-requested_size) % 4; size_t n_pad_bytes = 4 - (requested_size % 4); // Same as (-x) % 4, without negating unsigned
m_data.reset(new byte[requested_size + n_pad_bytes]); m_data.reset(new byte[requested_size + n_pad_bytes]);
m_size = requested_size + n_pad_bytes; m_size = requested_size + n_pad_bytes;