Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-01 02:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[cscore, wpilibcExamples] Use double-quote includes for wpi/ (#8346)

Browse Source 
Use ERR and WARN in cscore to avoid conflict with Windows headers.
This commit is contained in:
Peter Johnson
2025-11-08 16:58:51 -08:00
committed by GitHub
parent fc4e922206
commit 5c9c45fadb
226 changed files with 868 additions and 951 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cscore/src/main/native/linux/NetworkListener.cpp
View File

@@ -70,15 +70,14 @@ void NetworkListener::Impl::Thread::Main() {
// Create event socket so we can be shut down
m_command_fd = ::eventfd(0, 0);
if (m_command_fd < 0) {
ERROR("NetworkListener: could not create eventfd: {}",
std::strerror(errno));
ERR("NetworkListener: could not create eventfd: {}", std::strerror(errno));
return;
}
// Create netlink socket
int sd = ::socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
if (sd < 0) {
ERROR("NetworkListener: could not create socket: {}", std::strerror(errno));
ERR("NetworkListener: could not create socket: {}", std::strerror(errno));
::close(m_command_fd);
m_command_fd = -1;
return;
@@ -91,7 +90,7 @@ void NetworkListener::Impl::Thread::Main() {
addr.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR;
// NOLINTNEXTLINE(modernize-avoid-bind)
if (bind(sd, reinterpret_cast<struct sockaddr*>(&addr), sizeof(addr)) < 0) {
ERROR("NetworkListener: could not create socket: {}", std::strerror(errno));
ERR("NetworkListener: could not create socket: {}", std::strerror(errno));
::close(sd);
::close(m_command_fd);
m_command_fd = -1;
@@ -114,7 +113,7 @@ void NetworkListener::Impl::Thread::Main() {
int nfds = std::max(m_command_fd, sd) + 1;
if (::select(nfds, &readfds, nullptr, nullptr, &tv) < 0) {
ERROR("NetworkListener: select(): {}", std::strerror(errno));
ERR("NetworkListener: select(): {}", std::strerror(errno));
break; // XXX: is this the right thing to do here?
}
@@ -135,8 +134,7 @@ void NetworkListener::Impl::Thread::Main() {
if (errno == EWOULDBLOCK || errno == EAGAIN) {
continue;
}
ERROR("NetworkListener: could not read netlink: {}",
std::strerror(errno));
ERR("NetworkListener: could not read netlink: {}", std::strerror(errno));
break; // XXX: is this the right thing to do here?
}
if (len == 0) {

7
cscore/src/main/native/linux/UsbCameraListener.cpp
View File

@@ -6,11 +6,10 @@
#include <memory>
#include <wpi/net/EventLoopRunner.hpp>
#include <wpi/net/uv/FsEvent.hpp>
#include <wpi/net/uv/Timer.hpp>
#include "Notifier.hpp"
#include "wpi/net/EventLoopRunner.hpp"
#include "wpi/net/uv/FsEvent.hpp"
#include "wpi/net/uv/Timer.hpp"
#include "wpi/util/StringExtras.hpp"
using namespace wpi::cs;