From 436f514142f135a5255013f6d697d9611544e527 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Mon, 14 May 2018 18:47:52 +0900 Subject: [PATCH] AP_Proximity: resolve compiler warning and format fix --- libraries/AP_Proximity/AP_Proximity_RangeFinder.cpp | 4 ++-- libraries/AP_Proximity/AP_Proximity_RangeFinder.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/AP_Proximity/AP_Proximity_RangeFinder.cpp b/libraries/AP_Proximity/AP_Proximity_RangeFinder.cpp index 05f71b8f89..b1dc1a03a7 100644 --- a/libraries/AP_Proximity/AP_Proximity_RangeFinder.cpp +++ b/libraries/AP_Proximity/AP_Proximity_RangeFinder.cpp @@ -24,8 +24,8 @@ extern const AP_HAL::HAL& hal; AP_Proximity_RangeFinder::AP_Proximity_RangeFinder(AP_Proximity &_frontend, AP_Proximity::Proximity_State &_state) : - _distance_upward(-1), - AP_Proximity_Backend(_frontend, _state) + AP_Proximity_Backend(_frontend, _state), + _distance_upward(-1) { } diff --git a/libraries/AP_Proximity/AP_Proximity_RangeFinder.h b/libraries/AP_Proximity/AP_Proximity_RangeFinder.h index 15e47d7e6f..7f5dbf36ec 100644 --- a/libraries/AP_Proximity/AP_Proximity_RangeFinder.h +++ b/libraries/AP_Proximity/AP_Proximity_RangeFinder.h @@ -17,7 +17,7 @@ public: // get maximum and minimum distances (in meters) of sensor float distance_max() const { return _distance_max; } - float distance_min() const { return _distance_min; }; + float distance_min() const { return _distance_min; } // get distance upwards in meters. returns true on success bool get_upward_distance(float &distance) const;