From 157da70cf7865cec64869009a7cd49d98fadd93b Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Thu, 1 Aug 2019 13:24:21 +1000 Subject: [PATCH] Sub: fix compiler warnings on has_disarm_function --- ArduSub/AP_Arming_Sub.cpp | 2 +- ArduSub/AP_Arming_Sub.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ArduSub/AP_Arming_Sub.cpp b/ArduSub/AP_Arming_Sub.cpp index 89e09ddd61..be1fc6abb9 100644 --- a/ArduSub/AP_Arming_Sub.cpp +++ b/ArduSub/AP_Arming_Sub.cpp @@ -12,7 +12,7 @@ bool AP_Arming_Sub::rc_calibration_checks(bool display_failure) return rc_checks_copter_sub(display_failure, channels); } -const bool AP_Arming_Sub::has_disarm_function () { +bool AP_Arming_Sub::has_disarm_function() const { bool has_shift_function = false; // make sure the craft has a disarm button assigned before it is armed // check all the standard btn functions diff --git a/ArduSub/AP_Arming_Sub.h b/ArduSub/AP_Arming_Sub.h index 0fcc85f6c3..2fab5503fb 100644 --- a/ArduSub/AP_Arming_Sub.h +++ b/ArduSub/AP_Arming_Sub.h @@ -13,7 +13,7 @@ public: bool rc_calibration_checks(bool display_failure) override; bool pre_arm_checks(bool display_failure) override; - const bool has_disarm_function(); + bool has_disarm_function() const; bool disarm() override; bool arm(AP_Arming::Method method, bool do_arming_checks=true) override;