Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-10 09:58:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Param: fixed a compiler warning with -Wsign-conversion

Browse Source
This commit is contained in:
Tobias 2013-05-24 16:39:32 +02:00 committed by Andrew Tridgell
parent 27a5c28851
commit 4a75351bd3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_Param/AP_Param.cpp
View File

@ -920,7 +920,7 @@ AP_Param *AP_Param::next_group(uint8_t vindex, const struct GroupInfo *group_inf
*ptype = AP_PARAM_FLOAT; *ptype = AP_PARAM_FLOAT;
} }
uintptr_t ofs = (uintptr_t)PGM_POINTER(&_var_info[vindex].ptr) + PGM_UINT16(&group_info[i].offset); uintptr_t ofs = (uintptr_t)PGM_POINTER(&_var_info[vindex].ptr) + PGM_UINT16(&group_info[i].offset);
ofs += sizeof(float)*(token->idx-1); ofs += sizeof(float)*(token->idx - 1u);
return (AP_Param *)ofs; return (AP_Param *)ofs;
} }
} }
@ -948,7 +948,7 @@ AP_Param *AP_Param::next(ParamToken *token, enum ap_var_type *ptype)
if (ptype != NULL) { if (ptype != NULL) {
*ptype = AP_PARAM_FLOAT; *ptype = AP_PARAM_FLOAT;
} }
return (AP_Param *)(((token->idx-1)*sizeof(float))+(uintptr_t)PGM_POINTER(&_var_info[i].ptr)); return (AP_Param *)(((token->idx - 1u)*sizeof(float))+(uintptr_t)PGM_POINTER(&_var_info[i].ptr));
} }
if (type != AP_PARAM_GROUP) { if (type != AP_PARAM_GROUP) {