mirror of https://github.com/ArduPilot/ardupilot
AP_HAL: re-order initialiser lines so -Werror=reorder will work
AP_HAL: correct compilation for sim-on-hardware with -werror=reorder
This commit is contained in:
parent
35f2dce575
commit
cca1edb78d
|
@ -67,9 +67,6 @@ public:
|
||||||
scheduler(_scheduler),
|
scheduler(_scheduler),
|
||||||
util(_util),
|
util(_util),
|
||||||
opticalflow(_opticalflow),
|
opticalflow(_opticalflow),
|
||||||
#if AP_SIM_ENABLED && CONFIG_HAL_BOARD != HAL_BOARD_SITL
|
|
||||||
simstate(_simstate),
|
|
||||||
#endif
|
|
||||||
flash(_flash),
|
flash(_flash),
|
||||||
#if HAL_WITH_DSP
|
#if HAL_WITH_DSP
|
||||||
dsp(_dsp),
|
dsp(_dsp),
|
||||||
|
@ -85,6 +82,9 @@ public:
|
||||||
_serial7,
|
_serial7,
|
||||||
_serial8,
|
_serial8,
|
||||||
_serial9}
|
_serial9}
|
||||||
|
#if AP_SIM_ENABLED && CONFIG_HAL_BOARD != HAL_BOARD_SITL
|
||||||
|
,simstate(_simstate)
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
#if HAL_NUM_CAN_IFACES > 0
|
#if HAL_NUM_CAN_IFACES > 0
|
||||||
if (_can_ifaces == nullptr) {
|
if (_can_ifaces == nullptr) {
|
||||||
|
|
Loading…
Reference in New Issue