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

AP_Common: add ASSERT_STORAGE_SIZE macro 

saves havin gto name the dummy variable yourself
This commit is contained in:
Peter Barker 2023-12-14 10:20:16 +11:00 committed by Peter Barker
parent 9de1b6164b
commit 5488ca6403
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/AP_Common/AP_Common.h
View File

@ -142,6 +142,11 @@ template<typename s, size_t t> struct assert_storage_size {
_assert_storage_size<s, sizeof(s), t> _member; _assert_storage_size<s, sizeof(s), t> _member;
}; };
#define ASSERT_STORAGE_SIZE_JOIN( name, line ) ASSERT_STORAGE_SIZE_DO_JOIN( name, line )
#define ASSERT_STORAGE_SIZE_DO_JOIN( name, line ) name ## line
#define ASSERT_STORAGE_SIZE(structure, size) \
do { assert_storage_size<structure, size> ASSERT_STORAGE_SIZE_JOIN(assert_storage_sizex, __LINE__); (void)ASSERT_STORAGE_SIZE_JOIN(assert_storage_sizex, __LINE__); } while(false)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @name Conversions /// @name Conversions
/// ///

7
libraries/AP_Common/Location.cpp
View File

@ -27,6 +27,9 @@ void Location::zero(void)
// Construct location using position (NEU) from ekf_origin for the given altitude frame // Construct location using position (NEU) from ekf_origin for the given altitude frame
Location::Location(int32_t latitude, int32_t longitude, int32_t alt_in_cm, AltFrame frame) Location::Location(int32_t latitude, int32_t longitude, int32_t alt_in_cm, AltFrame frame)
{ {
// make sure we know what size the Location object is:
ASSERT_STORAGE_SIZE(Location, 16);
zero(); zero();
lat = latitude; lat = latitude;
lng = longitude; lng = longitude;
@ -381,10 +384,6 @@ bool Location::sanitize(const Location &defaultLoc)
return has_changed; return has_changed;
} }
// make sure we know what size the Location object is:
assert_storage_size<Location, 16> _assert_storage_size_Location;
// return bearing in radians from location to loc2, return is 0 to 2*Pi // return bearing in radians from location to loc2, return is 0 to 2*Pi
ftype Location::get_bearing(const Location &loc2) const ftype Location::get_bearing(const Location &loc2) const
{ {