From cca1edb78d3f38ce03752bd3746fb78c23d453e3 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Sun, 10 Nov 2024 14:31:39 +1100 Subject: [PATCH] AP_HAL: re-order initialiser lines so -Werror=reorder will work AP_HAL: correct compilation for sim-on-hardware with -werror=reorder --- libraries/AP_HAL/HAL.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/AP_HAL/HAL.h b/libraries/AP_HAL/HAL.h index 723e68f64f..a2bef78e47 100644 --- a/libraries/AP_HAL/HAL.h +++ b/libraries/AP_HAL/HAL.h @@ -67,9 +67,6 @@ public: scheduler(_scheduler), util(_util), opticalflow(_opticalflow), -#if AP_SIM_ENABLED && CONFIG_HAL_BOARD != HAL_BOARD_SITL - simstate(_simstate), -#endif flash(_flash), #if HAL_WITH_DSP dsp(_dsp), @@ -85,6 +82,9 @@ public: _serial7, _serial8, _serial9} +#if AP_SIM_ENABLED && CONFIG_HAL_BOARD != HAL_BOARD_SITL + ,simstate(_simstate) +#endif { #if HAL_NUM_CAN_IFACES > 0 if (_can_ifaces == nullptr) {