fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-01 05:51:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bad merge artifacts

Browse Source 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2016-02-19 16:59:44 +01:00
committed by Julian Oes
parent f25613ebeb
commit 304caead99
2 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platforms/posix/tests/vcdev_test/vcdevtest_example.cpp
-9
View File
@@ -59,14 +59,11 @@ static int writer_main(int argc, char *argv[])
{
char buf[1];
int fd = px4_open(TESTDEV, PX4_F_WRONLY);
int fd = px4_open(TESTDEV, PX4_F_WRONLY);
if (fd < 0) {
PX4_INFO("Writer: Open failed %d %d", fd, px4_errno);
return -px4_errno;
}
src/platforms/posix/tests/vcdev_test/vcdevtest_example.cpp
int ret;
int i = 0;
@@ -94,12 +91,6 @@ src/platforms/posix/tests/vcdev_test/vcdevtest_example.cpp
class PrivData
{
PrivData() : _read_offset(0) {}
~PrivData() {}
size_t _read_offset;
};
public:
PrivData() : _read_offset(0) {}
~PrivData() {}