From 73f47065978304e6ae6d27c5959f52fa541b77d2 Mon Sep 17 00:00:00 2001
From: Matthias Grob <maetugr@gmail.com>
Date: Sun, 27 Jan 2019 09:42:33 +0000
Subject: [PATCH] simulator_mavlink: consistent system call scope operator
---
src/modules/simulator/simulator_mavlink.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/modules/simulator/simulator_mavlink.cpp b/src/modules/simulator/simulator_mavlink.cpp
index aadc006f42..6576c38337 100644
--- a/src/modules/simulator/simulator_mavlink.cpp
+++ b/src/modules/simulator/simulator_mavlink.cpp
@@ -679,8 +679,8 @@ void Simulator::pollForMAVLinkMessages(bool publish)
while (true) {
// Once we receive something, we're most probably good and can carry on.
- int len = recvfrom(_fd, _buf, sizeof(_buf), 0,
- (struct sockaddr *)&_srcaddr, (socklen_t *)&_addrlen);
+ int len = ::recvfrom(_fd, _buf, sizeof(_buf), 0,
+ (struct sockaddr *)&_srcaddr, (socklen_t *)&_addrlen);
if (len > 0) {
break;
@@ -716,7 +716,7 @@ void Simulator::pollForMAVLinkMessages(bool publish)
break;
} else {
- close(_fd);
+ ::close(_fd);
system_sleep(1);
}
}
@@ -798,8 +798,8 @@ void Simulator::pollForMAVLinkMessages(bool publish)
if (fds[0].revents & POLLIN) {
- int len = recvfrom(_fd, _buf, sizeof(_buf), 0,
- (struct sockaddr *)&_srcaddr, (socklen_t *)&_addrlen);
+ int len = ::recvfrom(_fd, _buf, sizeof(_buf), 0,
+ (struct sockaddr *)&_srcaddr, (socklen_t *)&_addrlen);
if (len > 0) {
mavlink_message_t msg;
--
GitLab