mirror of https://github.com/ArduPilot/ardupilot
AC_PrecLand: use NEW_NOTHROW for new(std::nothrow)
This commit is contained in:
parent
4c41805a3d
commit
260a8eaddc
|
@ -229,7 +229,7 @@ void AC_PrecLand::init(uint16_t update_rate_hz)
|
||||||
const uint16_t inertial_buffer_size = MAX((uint16_t)roundf(_lag * MIN(update_rate_hz, AP::scheduler().get_loop_rate_hz())), 1);
|
const uint16_t inertial_buffer_size = MAX((uint16_t)roundf(_lag * MIN(update_rate_hz, AP::scheduler().get_loop_rate_hz())), 1);
|
||||||
|
|
||||||
// instantiate ring buffer to hold inertial history, return on failure so no backends are created
|
// instantiate ring buffer to hold inertial history, return on failure so no backends are created
|
||||||
_inertial_history = new ObjectArray<inertial_data_frame_s>(inertial_buffer_size);
|
_inertial_history = NEW_NOTHROW ObjectArray<inertial_data_frame_s>(inertial_buffer_size);
|
||||||
if (_inertial_history == nullptr) {
|
if (_inertial_history == nullptr) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -243,23 +243,23 @@ void AC_PrecLand::init(uint16_t update_rate_hz)
|
||||||
// companion computer
|
// companion computer
|
||||||
#if AC_PRECLAND_COMPANION_ENABLED
|
#if AC_PRECLAND_COMPANION_ENABLED
|
||||||
case Type::COMPANION:
|
case Type::COMPANION:
|
||||||
_backend = new AC_PrecLand_Companion(*this, _backend_state);
|
_backend = NEW_NOTHROW AC_PrecLand_Companion(*this, _backend_state);
|
||||||
break;
|
break;
|
||||||
// IR Lock
|
// IR Lock
|
||||||
#endif
|
#endif
|
||||||
#if AC_PRECLAND_IRLOCK_ENABLED
|
#if AC_PRECLAND_IRLOCK_ENABLED
|
||||||
case Type::IRLOCK:
|
case Type::IRLOCK:
|
||||||
_backend = new AC_PrecLand_IRLock(*this, _backend_state);
|
_backend = NEW_NOTHROW AC_PrecLand_IRLock(*this, _backend_state);
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
#if AC_PRECLAND_SITL_GAZEBO_ENABLED
|
#if AC_PRECLAND_SITL_GAZEBO_ENABLED
|
||||||
case Type::SITL_GAZEBO:
|
case Type::SITL_GAZEBO:
|
||||||
_backend = new AC_PrecLand_SITL_Gazebo(*this, _backend_state);
|
_backend = NEW_NOTHROW AC_PrecLand_SITL_Gazebo(*this, _backend_state);
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
#if AC_PRECLAND_SITL_ENABLED
|
#if AC_PRECLAND_SITL_ENABLED
|
||||||
case Type::SITL:
|
case Type::SITL:
|
||||||
_backend = new AC_PrecLand_SITL(*this, _backend_state);
|
_backend = NEW_NOTHROW AC_PrecLand_SITL(*this, _backend_state);
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue