From 81df9aaeb4541ac84960f8f8e6e625c68e04cda5 Mon Sep 17 00:00:00 2001 From: Tom Pittenger Date: Sun, 10 Feb 2019 10:29:43 -0800 Subject: [PATCH] AP_HAL_SITL: unify singleton naming to _singleton and get_singleton() --- libraries/AP_HAL_SITL/SITL_State.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/AP_HAL_SITL/SITL_State.cpp b/libraries/AP_HAL_SITL/SITL_State.cpp index 9b65d5dc4b..2039371ecd 100644 --- a/libraries/AP_HAL_SITL/SITL_State.cpp +++ b/libraries/AP_HAL_SITL/SITL_State.cpp @@ -74,8 +74,8 @@ void SITL_State::_sitl_setup(const char *home_str) // find the barometer object if it exists _sitl = AP::sitl(); - _barometer = AP_Baro::get_instance(); - _ins = AP_InertialSensor::get_instance(); + _barometer = AP_Baro::get_singleton(); + _ins = AP_InertialSensor::get_singleton(); _compass = Compass::get_singleton(); #if AP_TERRAIN_AVAILABLE _terrain = reinterpret_cast(AP_Param::find_object("TERRAIN_"));