Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +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

2
cscore/src/main/native/cpp/HttpCameraImpl.cpp
View File

@@ -10,7 +10,6 @@
#include <vector>
#include <fmt/format.h>
#include <wpi/net/TCPConnector.h>
#include "Instance.hpp"
#include "JpegUtil.hpp"
@@ -18,6 +17,7 @@
#include "Notifier.hpp"
#include "Telemetry.hpp"
#include "c_util.hpp"
#include "wpi/net/TCPConnector.h"
#include "wpi/util/MemAlloc.hpp"
#include "wpi/util/StringExtras.hpp"
#include "wpi/util/timestamp.h"

3
cscore/src/main/native/cpp/HttpCameraImpl.hpp
View File

@@ -15,10 +15,9 @@
#include <thread>
#include <vector>
#include <wpi/net/HttpUtil.hpp>
#include "SourceImpl.hpp"
#include "wpi/cs/cscore_cpp.hpp"
#include "wpi/net/HttpUtil.hpp"
#include "wpi/util/StringMap.hpp"
#include "wpi/util/condition_variable.hpp"
#include "wpi/util/raw_istream.hpp"

3
cscore/src/main/native/cpp/Instance.hpp
View File

@@ -8,8 +8,6 @@
#include <memory>
#include <utility>
#include <wpi/net/EventLoopRunner.hpp>
#include "Log.hpp"
#include "NetworkListener.hpp"
#include "Notifier.hpp"
@@ -18,6 +16,7 @@
#include "Telemetry.hpp"
#include "UnlimitedHandleResource.hpp"
#include "UsbCameraListener.hpp"
#include "wpi/net/EventLoopRunner.hpp"
#include "wpi/util/Logger.hpp"
namespace wpi::cs {

6
cscore/src/main/native/cpp/Log.hpp
View File

@@ -30,10 +30,8 @@ inline void NamedLog(wpi::util::Logger& logger, unsigned int level,
#define LOG(level, format, ...) \
WPI_LOG(m_logger, level, format __VA_OPT__(, ) __VA_ARGS__)
#undef ERROR
#define ERROR(format, ...) \
WPI_ERROR(m_logger, format __VA_OPT__(, ) __VA_ARGS__)
#define WARNING(format, ...) \
#define ERR(format, ...) WPI_ERROR(m_logger, format __VA_OPT__(, ) __VA_ARGS__)
#define WARN(format, ...) \
WPI_WARNING(m_logger, format __VA_OPT__(, ) __VA_ARGS__)
#define INFO(format, ...) WPI_INFO(m_logger, format __VA_OPT__(, ) __VA_ARGS__)

9
cscore/src/main/native/cpp/MjpegServerImpl.cpp
View File

@@ -9,11 +9,6 @@
#include <string>
#include <utility>
#include <wpi/net/HttpUtil.hpp>
#include <wpi/net/TCPAcceptor.h>
#include <wpi/net/raw_socket_istream.hpp>
#include <wpi/net/raw_socket_ostream.hpp>
#include "Instance.hpp"
#include "JpegUtil.hpp"
#include "Log.hpp"
@@ -21,6 +16,10 @@
#include "SourceImpl.hpp"
#include "c_util.hpp"
#include "wpi/cs/cscore_cpp.hpp"
#include "wpi/net/HttpUtil.hpp"
#include "wpi/net/TCPAcceptor.h"
#include "wpi/net/raw_socket_istream.hpp"
#include "wpi/net/raw_socket_ostream.hpp"
#include "wpi/util/SmallString.hpp"
#include "wpi/util/StringExtras.hpp"
#include "wpi/util/fmt/raw_ostream.hpp"

7
cscore/src/main/native/cpp/MjpegServerImpl.hpp
View File

@@ -12,11 +12,10 @@
#include <thread>
#include <vector>
#include <wpi/net/NetworkAcceptor.hpp>
#include <wpi/net/NetworkStream.hpp>
#include <wpi/net/raw_socket_ostream.hpp>
#include "SinkImpl.hpp"
#include "wpi/net/NetworkAcceptor.hpp"
#include "wpi/net/NetworkStream.hpp"
#include "wpi/net/raw_socket_ostream.hpp"
#include "wpi/util/SafeThread.hpp"
#include "wpi/util/SmallVector.hpp"
#include "wpi/util/raw_istream.hpp"

3
cscore/src/main/native/cpp/cscore_cpp.cpp
View File

@@ -8,8 +8,6 @@
#include <string>
#include <vector>
#include <wpi/net/hostname.hpp>
#include "Handle.hpp"
#include "Instance.hpp"
#include "NetworkListener.hpp"
@@ -18,6 +16,7 @@
#include "SinkImpl.hpp"
#include "SourceImpl.hpp"
#include "Telemetry.hpp"
#include "wpi/net/hostname.hpp"
#include "wpi/util/SmallString.hpp"
#include "wpi/util/json.hpp"