From c56486a39ec62035e10cb49c023f6588319ae5de Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Tue, 2 Jan 2018 11:33:08 +1100 Subject: [PATCH] AP_Baro: remove pointless destructor overrides --- libraries/AP_Baro/AP_Baro_BMP280.h | 1 - libraries/AP_Baro/AP_Baro_ICM20789.h | 3 +-- libraries/AP_Baro/AP_Baro_KellerLD.h | 1 - libraries/AP_Baro/AP_Baro_LPS25H.h | 1 - libraries/AP_Baro/AP_Baro_MS5611.h | 3 +-- 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/libraries/AP_Baro/AP_Baro_BMP280.h b/libraries/AP_Baro/AP_Baro_BMP280.h index da94b74b32..75f15fe0b9 100644 --- a/libraries/AP_Baro/AP_Baro_BMP280.h +++ b/libraries/AP_Baro/AP_Baro_BMP280.h @@ -17,7 +17,6 @@ public: static AP_Baro_Backend *probe(AP_Baro &baro, AP_HAL::OwnPtr dev); private: - virtual ~AP_Baro_BMP280(void) {}; bool _init(void); void _timer(void); diff --git a/libraries/AP_Baro/AP_Baro_ICM20789.h b/libraries/AP_Baro/AP_Baro_ICM20789.h index 40a63f3eac..c026642165 100644 --- a/libraries/AP_Baro/AP_Baro_ICM20789.h +++ b/libraries/AP_Baro/AP_Baro_ICM20789.h @@ -21,8 +21,7 @@ public: private: AP_Baro_ICM20789(AP_Baro &baro, AP_HAL::OwnPtr dev); - virtual ~AP_Baro_ICM20789(void) {}; - + bool init(); bool send_cmd16(uint16_t cmd); diff --git a/libraries/AP_Baro/AP_Baro_KellerLD.h b/libraries/AP_Baro/AP_Baro_KellerLD.h index 1519d32b9a..29c824a40d 100644 --- a/libraries/AP_Baro/AP_Baro_KellerLD.h +++ b/libraries/AP_Baro/AP_Baro_KellerLD.h @@ -44,7 +44,6 @@ public: private: AP_Baro_KellerLD(AP_Baro &baro, AP_HAL::OwnPtr dev); - virtual ~AP_Baro_KellerLD(void) {}; bool _init(); diff --git a/libraries/AP_Baro/AP_Baro_LPS25H.h b/libraries/AP_Baro/AP_Baro_LPS25H.h index 911efd98fe..05daf0c97c 100644 --- a/libraries/AP_Baro/AP_Baro_LPS25H.h +++ b/libraries/AP_Baro/AP_Baro_LPS25H.h @@ -21,7 +21,6 @@ public: static AP_Baro_Backend *probe(AP_Baro &baro, AP_HAL::OwnPtr dev); private: - virtual ~AP_Baro_LPS25H(void) {}; bool _init(void); void _timer(void); diff --git a/libraries/AP_Baro/AP_Baro_MS5611.h b/libraries/AP_Baro/AP_Baro_MS5611.h index b81900fd61..8f69f62060 100644 --- a/libraries/AP_Baro/AP_Baro_MS5611.h +++ b/libraries/AP_Baro/AP_Baro_MS5611.h @@ -38,8 +38,7 @@ private: uint8_t *count, uint8_t max_count); AP_Baro_MS56XX(AP_Baro &baro, AP_HAL::OwnPtr dev, enum MS56XX_TYPE ms56xx_type); - virtual ~AP_Baro_MS56XX(void) {}; - + bool _init(); void _calculate_5611();