From e51d3585522836450e9d9adbeabd1a689e9b3138 Mon Sep 17 00:00:00 2001 From: bugobliterator Date: Fri, 30 Jul 2021 16:11:47 +0530 Subject: [PATCH] AP_RangeFinder: use typename SIM instead of SITL as it conflicts with namespace name --- libraries/AP_RangeFinder/AP_RangeFinder.cpp | 2 +- libraries/AP_RangeFinder/AP_RangeFinder.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/AP_RangeFinder/AP_RangeFinder.cpp b/libraries/AP_RangeFinder/AP_RangeFinder.cpp index 4cd9dae559..41e3c81d51 100644 --- a/libraries/AP_RangeFinder/AP_RangeFinder.cpp +++ b/libraries/AP_RangeFinder/AP_RangeFinder.cpp @@ -556,7 +556,7 @@ void RangeFinder::detect_instance(uint8_t instance, uint8_t& serial_instance) } break; - case Type::SITL: + case Type::SIM: #if CONFIG_HAL_BOARD == HAL_BOARD_SITL _add_backend(new AP_RangeFinder_SITL(state[instance], params[instance], instance), instance); #endif diff --git a/libraries/AP_RangeFinder/AP_RangeFinder.h b/libraries/AP_RangeFinder/AP_RangeFinder.h index 6e264e4c6b..502c69fdb5 100644 --- a/libraries/AP_RangeFinder/AP_RangeFinder.h +++ b/libraries/AP_RangeFinder/AP_RangeFinder.h @@ -88,7 +88,7 @@ public: GYUS42v2 = 31, MSP = 32, USD1_CAN = 33, - SITL = 100, + SIM = 100, }; enum class Function {