Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Common: fixed cast warnings for ExpandingArray

This commit is contained in:
Andrew Tridgell 2020-07-06 08:17:38 +10:00
parent 19093e25be
commit 7138811a57
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/AP_Common/AP_ExpandingArray.h
View File

@ -95,15 +95,23 @@ public:
T &operator[](uint16_t i)
{
const uint16_t chunk_num = i / chunk_size;
const uint16_t chunk_index = (i % chunk_size) * elem_size;
return (T &)(chunk_ptrs[chunk_num][chunk_index]);
const uint16_t chunk_index = (i % chunk_size);
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcast-align"
T *el_array = (T *)chunk_ptrs[chunk_num];
#pragma pop
return el_array[chunk_index];
}
// allow use as an array for accessing elements. no bounds checking is performed
const T &operator[](uint16_t i) const
{
const uint16_t chunk_num = i / chunk_size;
const uint16_t chunk_index = (i % chunk_size) * elem_size;
return (const T &)(chunk_ptrs[chunk_num][chunk_index]);
const uint16_t chunk_index = (i % chunk_size);
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcast-align"
const T *el_array = (const T *)chunk_ptrs[chunk_num];
#pragma pop
return el_array[chunk_index];
}
};