c++11 default destructors

This commit is contained in:
Daniel Agar
2018-06-26 14:08:34 -04:00
parent c39ac93ca8
commit 02d4405a62
49 changed files with 38 additions and 214 deletions
+1 -3
View File
@@ -194,9 +194,7 @@ BMP280::~BMP280()
int
BMP280::init()
{
int ret;
ret = CDev::init();
int ret = CDev::init();
if (ret != OK) {
DEVICE_DEBUG("CDev init failed");
+1 -13
View File
@@ -67,9 +67,8 @@ class LPS25H_I2C : public device::I2C
{
public:
LPS25H_I2C(int bus);
virtual ~LPS25H_I2C();
virtual ~LPS25H_I2C() = default;
virtual int init();
virtual int read(unsigned address, void *data, unsigned count);
virtual int write(unsigned address, void *data, unsigned count);
@@ -91,17 +90,6 @@ LPS25H_I2C::LPS25H_I2C(int bus) :
{
}
LPS25H_I2C::~LPS25H_I2C()
{
}
int
LPS25H_I2C::init()
{
/* this will call probe() */
return I2C::init();
}
int
LPS25H_I2C::ioctl(unsigned operation, unsigned &arg)
{
+1 -5
View File
@@ -73,7 +73,7 @@ class LPS25H_SPI : public device::SPI
{
public:
LPS25H_SPI(int bus, uint32_t device);
virtual ~LPS25H_SPI();
virtual ~LPS25H_SPI() = default;
virtual int init();
virtual int read(unsigned address, void *data, unsigned count);
@@ -95,10 +95,6 @@ LPS25H_SPI::LPS25H_SPI(int bus, uint32_t device) :
_device_id.devid_s.devtype = DRV_MAG_DEVTYPE_LPS25H;
}
LPS25H_SPI::~LPS25H_SPI()
{
}
int
LPS25H_SPI::init()
{
@@ -64,7 +64,7 @@ class MPL3115A2_I2C : public device::I2C
{
public:
MPL3115A2_I2C(uint8_t bus);
virtual ~MPL3115A2_I2C();
virtual ~MPL3115A2_I2C() = default;
virtual int init();
virtual int read(unsigned offset, void *data, unsigned count);
@@ -99,10 +99,6 @@ MPL3115A2_I2C::MPL3115A2_I2C(uint8_t bus) :
{
}
MPL3115A2_I2C::~MPL3115A2_I2C()
{
}
int
MPL3115A2_I2C::init()
{
+1 -13
View File
@@ -67,9 +67,8 @@ class MS5611_I2C : public device::I2C
{
public:
MS5611_I2C(uint8_t bus, ms5611::prom_u &prom_buf);
virtual ~MS5611_I2C();
virtual ~MS5611_I2C() = default;
virtual int init();
virtual int read(unsigned offset, void *data, unsigned count);
virtual int ioctl(unsigned operation, unsigned &arg);
@@ -116,17 +115,6 @@ MS5611_I2C::MS5611_I2C(uint8_t bus, ms5611::prom_u &prom) :
{
}
MS5611_I2C::~MS5611_I2C()
{
}
int
MS5611_I2C::init()
{
/* this will call probe(), and thereby _probe_address */
return I2C::init();
}
int
MS5611_I2C::read(unsigned offset, void *data, unsigned count)
{
+1 -5
View File
@@ -67,7 +67,7 @@ class MS5611_SPI : public device::SPI
{
public:
MS5611_SPI(uint8_t bus, uint32_t device, ms5611::prom_u &prom_buf);
virtual ~MS5611_SPI();
virtual ~MS5611_SPI() = default;
virtual int init();
virtual int read(unsigned offset, void *data, unsigned count);
@@ -136,10 +136,6 @@ MS5611_SPI::MS5611_SPI(uint8_t bus, uint32_t device, ms5611::prom_u &prom_buf) :
{
}
MS5611_SPI::~MS5611_SPI()
{
}
int
MS5611_SPI::init()
{
+1 -5
View File
@@ -135,7 +135,7 @@ class BlinkM : public device::I2C
{
public:
BlinkM(int bus, int blinkm);
virtual ~BlinkM();
virtual ~BlinkM() = default;
virtual int init();
@@ -311,10 +311,6 @@ BlinkM::BlinkM(int bus, int blinkm) :
memset(&_work, 0, sizeof(_work));
}
BlinkM::~BlinkM()
{
}
int
BlinkM::init()
{
@@ -12,8 +12,6 @@ CameraInterface::CameraInterface():
{
}
CameraInterface::~CameraInterface() = default;
void CameraInterface::get_pins()
{
@@ -21,7 +21,7 @@ public:
/**
* Destructor.
*/
virtual ~CameraInterface();
virtual ~CameraInterface() = default;
/**
* trigger the camera
@@ -21,10 +21,6 @@ CameraInterfaceGPIO::CameraInterfaceGPIO():
setup();
}
CameraInterfaceGPIO::~CameraInterfaceGPIO()
{
}
void CameraInterfaceGPIO::setup()
{
for (unsigned i = 0, t = 0; i < arraySize(_pins); i++) {
@@ -16,7 +16,7 @@ class CameraInterfaceGPIO : public CameraInterface
{
public:
CameraInterfaceGPIO();
virtual ~CameraInterfaceGPIO();
virtual ~CameraInterfaceGPIO() = default;
void trigger(bool trigger_on_true);
@@ -48,8 +48,6 @@ LidarLite::LidarLite() :
{
}
LidarLite::~LidarLite() = default;
void LidarLite::set_minimum_distance(const float min)
{
_min_distance = min;
@@ -58,7 +58,7 @@ class LidarLite
public:
LidarLite();
virtual ~LidarLite();
virtual ~LidarLite() = default;
virtual int init() = 0;
+1 -13
View File
@@ -67,9 +67,8 @@ class MPU6000_I2C : public device::I2C
{
public:
MPU6000_I2C(int bus, int device_type);
virtual ~MPU6000_I2C();
virtual ~MPU6000_I2C() = default;
virtual int init();
virtual int read(unsigned address, void *data, unsigned count);
virtual int write(unsigned address, void *data, unsigned count);
@@ -97,17 +96,6 @@ MPU6000_I2C::MPU6000_I2C(int bus, int device_type) :
_device_id.devid_s.devtype = DRV_ACC_DEVTYPE_MPU6000;
}
MPU6000_I2C::~MPU6000_I2C()
{
}
int
MPU6000_I2C::init()
{
/* this will call probe() */
return I2C::init();
}
int
MPU6000_I2C::ioctl(unsigned operation, unsigned &arg)
{
+1 -5
View File
@@ -101,7 +101,7 @@ class MPU6000_SPI : public device::SPI
{
public:
MPU6000_SPI(int bus, uint32_t device, int device_type);
virtual ~MPU6000_SPI();
virtual ~MPU6000_SPI() = default;
virtual int init();
virtual int read(unsigned address, void *data, unsigned count);
@@ -213,10 +213,6 @@ MPU6000_SPI::MPU6000_SPI(int bus, uint32_t device, int device_type) :
_device_id.devid_s.devtype = DRV_ACC_DEVTYPE_MPU6000;
}
MPU6000_SPI::~MPU6000_SPI()
{
}
int
MPU6000_SPI::init()
{
+1 -13
View File
@@ -69,9 +69,8 @@ class AK8963_I2C : public device::I2C
{
public:
AK8963_I2C(int bus);
virtual ~AK8963_I2C();
virtual ~AK8963_I2C() = default;
virtual int init();
virtual int read(unsigned address, void *data, unsigned count);
virtual int write(unsigned address, void *data, unsigned count);
@@ -95,17 +94,6 @@ AK8963_I2C::AK8963_I2C(int bus) :
_device_id.devid_s.devtype = DRV_MAG_DEVTYPE_MPU9250;
}
AK8963_I2C::~AK8963_I2C()
{
}
int
AK8963_I2C::init()
{
/* this will call probe() */
return I2C::init();
}
int
AK8963_I2C::ioctl(unsigned operation, unsigned &arg)
{
@@ -199,7 +199,7 @@ class ToneAlarm : public device::CDev
{
public:
ToneAlarm();
~ToneAlarm();
~ToneAlarm() = default;
virtual int init();
@@ -342,10 +342,6 @@ ToneAlarm::ToneAlarm() :
_tune_names[TONE_HOME_SET] = "home_set";
}
ToneAlarm::~ToneAlarm()
{
}
int
ToneAlarm::init()
{
@@ -67,9 +67,8 @@ class HMC5883_I2C : public device::I2C
{
public:
HMC5883_I2C(int bus);
virtual ~HMC5883_I2C();
virtual ~HMC5883_I2C() = default;
virtual int init();
virtual int read(unsigned address, void *data, unsigned count);
virtual int write(unsigned address, void *data, unsigned count);
@@ -92,17 +91,6 @@ HMC5883_I2C::HMC5883_I2C(int bus) :
_device_id.devid_s.devtype = DRV_MAG_DEVTYPE_HMC5883;
}
HMC5883_I2C::~HMC5883_I2C()
{
}
int
HMC5883_I2C::init()
{
/* this will call probe() */
return I2C::init();
}
int
HMC5883_I2C::ioctl(unsigned operation, unsigned &arg)
{
@@ -74,7 +74,7 @@ class HMC5883_SPI : public device::SPI
{
public:
HMC5883_SPI(int bus, uint32_t device);
virtual ~HMC5883_SPI();
virtual ~HMC5883_SPI() = default;
virtual int init();
virtual int read(unsigned address, void *data, unsigned count);
@@ -96,10 +96,6 @@ HMC5883_SPI::HMC5883_SPI(int bus, uint32_t device) :
_device_id.devid_s.devtype = DRV_MAG_DEVTYPE_HMC5883;
}
HMC5883_SPI::~HMC5883_SPI()
{
}
int
HMC5883_SPI::init()
{
@@ -65,9 +65,8 @@ class LIS3MDL_I2C : public device::I2C
{
public:
LIS3MDL_I2C(int bus);
virtual ~LIS3MDL_I2C();
virtual ~LIS3MDL_I2C() = default;
virtual int init();
virtual int ioctl(unsigned operation, unsigned &arg);
virtual int read(unsigned address, void *data, unsigned count);
virtual int write(unsigned address, void *data, unsigned count);
@@ -92,17 +91,6 @@ LIS3MDL_I2C::LIS3MDL_I2C(int bus) :
_device_id.devid_s.devtype = DRV_MAG_DEVTYPE_LIS3MDL;
}
LIS3MDL_I2C::~LIS3MDL_I2C()
{
}
int
LIS3MDL_I2C::init()
{
/* this will call probe() */
return I2C::init();
}
int
LIS3MDL_I2C::ioctl(unsigned operation, unsigned &arg)
{
@@ -68,7 +68,7 @@ class LIS3MDL_SPI : public device::SPI
{
public:
LIS3MDL_SPI(int bus, uint32_t device);
virtual ~LIS3MDL_SPI();
virtual ~LIS3MDL_SPI() = default;
virtual int init();
virtual int ioctl(unsigned operation, unsigned &arg);
@@ -91,10 +91,6 @@ LIS3MDL_SPI::LIS3MDL_SPI(int bus, uint32_t device) :
_device_id.devid_s.devtype = DRV_MAG_DEVTYPE_LIS3MDL;
}
LIS3MDL_SPI::~LIS3MDL_SPI()
{
}
int
LIS3MDL_SPI::init()
{
-4
View File
@@ -121,10 +121,6 @@ MD25::MD25(const char *deviceName, int bus,
setTimeout(true);
}
MD25::~MD25()
{
}
int MD25::readData()
{
uint8_t sendBuf[1];
+1 -1
View File
@@ -120,7 +120,7 @@ public:
/**
* deconstructor
*/
virtual ~MD25();
virtual ~MD25() = default;
/**
* @return software version
+1 -20
View File
@@ -74,10 +74,8 @@ class PCA8574 : public device::I2C
{
public:
PCA8574(int bus, int pca8574);
virtual ~PCA8574();
virtual ~PCA8574() = default;
virtual int init();
virtual int probe();
virtual int info();
virtual int ioctl(struct file *filp, int cmd, unsigned long arg);
@@ -133,23 +131,6 @@ PCA8574::PCA8574(int bus, int pca8574) :
memset(&_work, 0, sizeof(_work));
}
PCA8574::~PCA8574()
{
}
int
PCA8574::init()
{
int ret;
ret = I2C::init();
if (ret != OK) {
return ret;
}
return OK;
}
int
PCA8574::probe()
{
+1 -5
View File
@@ -112,7 +112,7 @@ class PCA9685 : public device::I2C
{
public:
PCA9685(int bus = PCA9685_BUS, uint8_t address = ADDR);
virtual ~PCA9685();
virtual ~PCA9685() = default;
virtual int init();
@@ -198,10 +198,6 @@ PCA9685::PCA9685(int bus, uint8_t address) :
memset(_current_values, 0, sizeof(_current_values));
}
PCA9685::~PCA9685()
{
}
int
PCA9685::init()
{
-4
View File
@@ -70,10 +70,6 @@ PX4IO_Uploader::PX4IO_Uploader() :
{
}
PX4IO_Uploader::~PX4IO_Uploader()
{
}
int
PX4IO_Uploader::upload(const char *filenames[])
{
+1 -1
View File
@@ -47,7 +47,7 @@ class PX4IO_Uploader
{
public:
PX4IO_Uploader();
virtual ~PX4IO_Uploader();
virtual ~PX4IO_Uploader() = default;
int upload(const char *filenames[]);
+1 -2
View File
@@ -87,13 +87,12 @@ static struct channel_handler_entry {
void *context;
} channel_handlers[MAX_TIMER_IO_CHANNELS];
static void input_capture_chan_handler(void *context, const io_timers_t *timer, uint32_t chan_index,
const timer_io_channels_t *chan,
hrt_abstime isrs_time, uint16_t isrs_rcnt)
{
}
static void input_capture_bind(unsigned channel, capture_callback_t callback, void *context)
{
irqstate_t flags = enter_critical_section();
+1 -5
View File
@@ -212,7 +212,7 @@ class ToneAlarm : public device::CDev
{
public:
ToneAlarm();
~ToneAlarm();
~ToneAlarm() = default;
virtual int init();
@@ -355,10 +355,6 @@ ToneAlarm::ToneAlarm() :
_tune_names[TONE_HOME_SET] = "home_set";
}
ToneAlarm::~ToneAlarm()
{
}
int
ToneAlarm::init()
{
-2
View File
@@ -54,8 +54,6 @@ BlockWaypointGuidance::BlockWaypointGuidance(SuperBlock *parent, const char *nam
{
}
BlockWaypointGuidance::~BlockWaypointGuidance() = default;;
void BlockWaypointGuidance::update(
const vehicle_global_position_s &pos,
const vehicle_attitude_s &att,
+3 -1
View File
@@ -75,11 +75,13 @@ private:
float _psiCmd;
public:
BlockWaypointGuidance(SuperBlock *parent, const char *name);
virtual ~BlockWaypointGuidance();
virtual ~BlockWaypointGuidance() = default;
void update(const vehicle_global_position_s &pos,
const vehicle_attitude_s &att,
const position_setpoint_s &missionCmd,
const position_setpoint_s &lastMissionCmd);
float getPsiCmd() { return _psiCmd; }
};
+1 -3
View File
@@ -60,7 +60,7 @@ class LED : device::CDev
{
public:
LED();
virtual ~LED();
virtual ~LED() = default;
virtual int init();
virtual int ioctl(device::file_t *filp, int cmd, unsigned long arg);
@@ -72,8 +72,6 @@ LED::LED() : CDev("led", LED0_DEVICE_PATH)
init();
}
LED::~LED() = default;
int
LED::init()
{
@@ -78,8 +78,6 @@ LandingTargetEstimator::LandingTargetEstimator() :
_check_params(true);
}
LandingTargetEstimator::~LandingTargetEstimator() = default;
void LandingTargetEstimator::update()
{
_check_params(false);
@@ -67,7 +67,7 @@ class LandingTargetEstimator
public:
LandingTargetEstimator();
virtual ~LandingTargetEstimator();
virtual ~LandingTargetEstimator() = default;
/*
* Get new measurements and update the state estimate
-2
View File
@@ -54,8 +54,6 @@
#include <asm/socket.h>
#endif
MavlinkShell::MavlinkShell() = default;
MavlinkShell::~MavlinkShell()
{
//closing the pipes will stop the thread as well
+1 -1
View File
@@ -48,7 +48,7 @@
class MavlinkShell
{
public:
MavlinkShell();
MavlinkShell() = default;
~MavlinkShell();
@@ -65,8 +65,6 @@ MavlinkFtpTest::MavlinkFtpTest() :
{
}
MavlinkFtpTest::~MavlinkFtpTest() = default;
/// @brief Called before every test to initialize the FTP Server.
void MavlinkFtpTest::_init()
{
@@ -44,7 +44,7 @@ class MavlinkFtpTest : public UnitTest
{
public:
MavlinkFtpTest();
virtual ~MavlinkFtpTest();
virtual ~MavlinkFtpTest() = default;
virtual bool run_tests(void);
@@ -145,14 +145,6 @@ int calc_timer_diff_to_dsp_us(int32_t *time_diff_us)
return 0;
}
px4muorb::KraitRpcWrapper::KraitRpcWrapper()
{
}
px4muorb::KraitRpcWrapper::~KraitRpcWrapper()
{
}
bool px4muorb::KraitRpcWrapper::Initialize()
{
bool rc = true;
@@ -45,12 +45,12 @@ public:
/**
* Constructor
*/
KraitRpcWrapper();
KraitRpcWrapper() = default;
/**
* destructor
*/
~KraitRpcWrapper();
~KraitRpcWrapper() = default;
/**
* Initiatizes the rpc channel px4 muorb
+1 -3
View File
@@ -209,7 +209,7 @@ class ACCELSIM_mag : public VirtDevObj
{
public:
ACCELSIM_mag(ACCELSIM *parent);
~ACCELSIM_mag();
~ACCELSIM_mag() = default;
virtual ssize_t devRead(void *buffer, size_t buflen);
virtual int devIOCTL(unsigned long cmd, unsigned long arg);
@@ -973,8 +973,6 @@ ACCELSIM_mag::ACCELSIM_mag(ACCELSIM *parent) :
m_id.dev_id_s.devtype = DRV_ACC_DEVTYPE_ACCELSIM;
}
ACCELSIM_mag::~ACCELSIM_mag() = default;
ssize_t
ACCELSIM_mag::devRead(void *buffer, size_t buflen)
{
@@ -72,8 +72,6 @@ Standard::Standard(VtolAttitudeControl *attc) :
_params_handles_standard.reverse_delay = param_find("VT_B_REV_DEL");
}
Standard::~Standard() = default;
void
Standard::parameters_update()
{
+1 -1
View File
@@ -55,7 +55,7 @@ class Standard : public VtolType
public:
Standard(VtolAttitudeControl *_att_controller);
~Standard();
~Standard() = default;
virtual void update_vtol_state();
virtual void update_transition_state();
@@ -65,8 +65,6 @@ Tailsitter::Tailsitter(VtolAttitudeControl *attc) :
_params_handles_tailsitter.front_trans_dur_p2 = param_find("VT_TRANS_P2_DUR");
}
Tailsitter::~Tailsitter() = default;
void
Tailsitter::parameters_update()
{
+1 -1
View File
@@ -52,7 +52,7 @@ class Tailsitter : public VtolType
public:
Tailsitter(VtolAttitudeControl *_att_controller);
~Tailsitter();
~Tailsitter() = default;
virtual void update_vtol_state();
virtual void update_transition_state();
@@ -65,8 +65,6 @@ Tiltrotor::Tiltrotor(VtolAttitudeControl *attc) :
_params_handles_tiltrotor.diff_thrust_scale = param_find("VT_FW_DIFTHR_SC");
}
Tiltrotor::~Tiltrotor() = default;
void
Tiltrotor::parameters_update()
{
+1 -1
View File
@@ -50,7 +50,7 @@ class Tiltrotor : public VtolType
public:
Tiltrotor(VtolAttitudeControl *_att_controller);
~Tiltrotor();
~Tiltrotor() = default;
virtual void update_vtol_state();
virtual void update_transition_state();
@@ -76,8 +76,6 @@ VtolType::VtolType(VtolAttitudeControl *att_controller) :
}
}
VtolType::~VtolType() = default;
bool VtolType::init()
{
const char *dev = PWM_OUTPUT0_DEVICE_PATH;
+1 -1
View File
@@ -116,7 +116,7 @@ public:
VtolType(const VtolType &) = delete;
VtolType &operator=(const VtolType &) = delete;
virtual ~VtolType();
virtual ~VtolType() = default;
/**
* Initialise.