From 38e303389bdec37817665ba5db619cff8b7b185e Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Tue, 9 Jul 2019 16:05:51 +1000
Subject: [PATCH] Plane: avoidance no longer takes ahrs in constructor

---
 ArduPlane/Plane.h          | 2 +-
 ArduPlane/avoidance_adsb.h | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ArduPlane/Plane.h b/ArduPlane/Plane.h
index c3f1c0c2d6..b2e893d104 100644
--- a/ArduPlane/Plane.h
+++ b/ArduPlane/Plane.h
@@ -673,7 +673,7 @@ private:
     AP_ADSB adsb;
 
     // avoidance of adsb enabled vehicles (normally manned vheicles)
-    AP_Avoidance_Plane avoidance_adsb{ahrs, adsb};
+    AP_Avoidance_Plane avoidance_adsb{adsb};
 
     // Outback Challenge Failsafe Support
 #if ADVANCED_FAILSAFE == ENABLED
diff --git a/ArduPlane/avoidance_adsb.h b/ArduPlane/avoidance_adsb.h
index 8261aed82a..a15ea3f255 100644
--- a/ArduPlane/avoidance_adsb.h
+++ b/ArduPlane/avoidance_adsb.h
@@ -8,10 +8,8 @@
 // functionality - for example, not doing anything while landed.
 class AP_Avoidance_Plane : public AP_Avoidance {
 public:
-    AP_Avoidance_Plane(AP_AHRS &ahrs, class AP_ADSB &adsb)
-        : AP_Avoidance(ahrs, adsb)
-    {
-    }
+
+    using AP_Avoidance::AP_Avoidance;
 
     /* Do not allow copies */
     AP_Avoidance_Plane(const AP_Avoidance_Plane &other) = delete;