dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Fix travis/clang report of overloaded virtual functions.

This commit is contained in:
Simon Wilks 2015-08-17 21:38:01 +00:00 committed by Lorenz Meier
parent 4eef65f313
commit 384047787a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/drivers/ms5611/ms5611_i2c.cpp
View File

@ -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;