From 384047787acd268f600233dda6bed3716f08563b Mon Sep 17 00:00:00 2001 From: Simon Wilks Date: Mon, 17 Aug 2015 21:38:01 +0000 Subject: [PATCH] Fix travis/clang report of overloaded virtual functions. --- src/drivers/ms5611/ms5611_i2c.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/drivers/ms5611/ms5611_i2c.cpp b/src/drivers/ms5611/ms5611_i2c.cpp index 11baafd23b..8f66304065 100644 --- a/src/drivers/ms5611/ms5611_i2c.cpp +++ b/src/drivers/ms5611/ms5611_i2c.cpp @@ -71,8 +71,8 @@ public: virtual ~MS5611_I2C(); virtual int init(); - virtual int read(unsigned offset, void *data, unsigned count); - virtual int ioctl(unsigned operation, unsigned &arg); + virtual ssize_t read(device::file_t *handlep, char *data, size_t count); + virtual int ioctl(device::file_t *handlep, int cmd, unsigned long arg); #ifdef __PX4_NUTTX protected: @@ -138,8 +138,8 @@ MS5611_I2C::init() return I2C::init(); } -int -MS5611_I2C::read(unsigned offset, void *data, unsigned count) +ssize_t +MS5611_I2C::read(device::file_t *handlep, char *data, size_t buflen) { union _cvt { uint8_t b[4]; @@ -162,11 +162,11 @@ MS5611_I2C::read(unsigned offset, void *data, unsigned count) } int -MS5611_I2C::ioctl(unsigned operation, unsigned &arg) +MS5611_I2C::ioctl(device::file_t *handlep, int cmd, unsigned long arg) { int ret; - switch (operation) { + switch (cmd) { case IOCTL_RESET: ret = _reset(); break;