From 7a04d6a6a2bc2e3d2045f0fa9df793c95dc9c9aa Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Tue, 11 Nov 2025 22:00:42 -0800 Subject: [PATCH] Merge wpiformat configs (#8365) After replacing the remaining include guards with `#pragma once`, I was able to merge all the wpiformat configs into one file in the repo root. This should make the config easier to reason about and maintain in the future. --- .styleguide | 100 +++++++++++++++--- cameraserver/.styleguide | 17 --- commandsv2/.styleguide | 17 --- commandsv3/.styleguide | 12 --- cscore/.styleguide | 35 ------ .../native/cpp/ConfigurableSourceImpl.hpp | 5 +- cscore/src/main/native/cpp/Frame.hpp | 5 +- cscore/src/main/native/cpp/Handle.hpp | 5 +- cscore/src/main/native/cpp/HttpCameraImpl.hpp | 5 +- cscore/src/main/native/cpp/Image.hpp | 5 +- cscore/src/main/native/cpp/Instance.hpp | 5 +- cscore/src/main/native/cpp/JpegUtil.hpp | 5 +- cscore/src/main/native/cpp/Log.hpp | 5 +- .../src/main/native/cpp/MjpegServerImpl.hpp | 5 +- .../src/main/native/cpp/NetworkListener.hpp | 5 +- cscore/src/main/native/cpp/Notifier.hpp | 5 +- .../src/main/native/cpp/PropertyContainer.hpp | 5 +- cscore/src/main/native/cpp/PropertyImpl.hpp | 5 +- cscore/src/main/native/cpp/RawSinkImpl.hpp | 7 +- cscore/src/main/native/cpp/RawSourceImpl.hpp | 5 +- cscore/src/main/native/cpp/SinkImpl.hpp | 5 +- cscore/src/main/native/cpp/SourceImpl.hpp | 5 +- cscore/src/main/native/cpp/Telemetry.hpp | 5 +- .../native/cpp/UnlimitedHandleResource.hpp | 5 +- .../src/main/native/cpp/UsbCameraListener.hpp | 5 +- cscore/src/main/native/cpp/c_util.hpp | 5 +- .../native/cpp/default_init_allocator.hpp | 5 +- .../src/main/native/include/wpi/cs/cscore.h | 5 +- .../src/main/native/include/wpi/cs/cscore_c.h | 5 +- .../main/native/include/wpi/cs/cscore_cpp.hpp | 5 +- .../main/native/include/wpi/cs/cscore_cv.hpp | 5 +- .../main/native/include/wpi/cs/cscore_oo.hpp | 5 +- .../main/native/include/wpi/cs/cscore_raw.h | 5 +- .../src/main/native/linux/UsbCameraBuffer.hpp | 5 +- .../src/main/native/linux/UsbCameraImpl.hpp | 5 +- .../main/native/linux/UsbCameraProperty.hpp | 5 +- cscore/src/main/native/linux/UsbUtil.hpp | 5 +- .../src/main/native/windows/UsbCameraImpl.hpp | 5 +- datalog/.styleguide | 25 ----- docs/.styleguide | 3 - glass/.styleguide | 20 ---- hal/.styleguide | 34 ------ hal/src/main/native/cpp/jni/HALUtil.h | 5 +- ntcore/.styleguide | 33 ------ ntcoreffi/.styleguide | 20 ---- romiVendordep/.styleguide | 18 ---- tools/datalogtool/.styleguide | 20 ---- tools/outlineviewer/.styleguide | 20 ---- tools/sysid/.styleguide | 20 ---- tools/wpical/.styleguide | 22 ---- wpigui/.styleguide | 25 ----- wpilibcExamples/.styleguide | 9 -- wpimath/.styleguide | 36 ------- wpinet/.styleguide | 35 ------ .../include/wpi/net/EventLoopRunner.hpp | 5 +- .../native/include/wpi/net/HttpParser.hpp | 5 +- .../include/wpi/net/HttpServerConnection.hpp | 5 +- .../main/native/include/wpi/net/HttpUtil.hpp | 5 +- .../wpi/net/HttpWebSocketServerConnection.hpp | 5 +- .../main/native/include/wpi/net/MimeTypes.hpp | 5 +- .../include/wpi/net/NetworkAcceptor.hpp | 5 +- .../native/include/wpi/net/NetworkStream.hpp | 5 +- .../native/include/wpi/net/PortForwarder.hpp | 5 - .../native/include/wpi/net/SocketError.hpp | 5 +- .../main/native/include/wpi/net/UDPClient.hpp | 5 +- .../main/native/include/wpi/net/UrlParser.hpp | 5 +- .../main/native/include/wpi/net/WebServer.hpp | 5 - .../main/native/include/wpi/net/WebSocket.hpp | 5 +- .../include/wpi/net/WebSocketServer.hpp | 5 +- .../native/include/wpi/net/WorkerThread.hpp | 5 +- .../main/native/include/wpi/net/hostname.hpp | 5 +- .../include/wpi/net/raw_socket_istream.hpp | 5 +- .../include/wpi/net/raw_socket_ostream.hpp | 5 +- .../native/include/wpi/net/raw_uv_ostream.hpp | 5 +- .../main/native/include/wpi/net/uv/Async.hpp | 5 +- .../include/wpi/net/uv/AsyncFunction.hpp | 5 +- .../main/native/include/wpi/net/uv/Buffer.hpp | 5 +- .../main/native/include/wpi/net/uv/Check.hpp | 5 +- .../main/native/include/wpi/net/uv/Error.hpp | 5 +- .../native/include/wpi/net/uv/FsEvent.hpp | 5 +- .../native/include/wpi/net/uv/GetAddrInfo.hpp | 5 +- .../native/include/wpi/net/uv/GetNameInfo.hpp | 5 +- .../main/native/include/wpi/net/uv/Handle.hpp | 5 +- .../main/native/include/wpi/net/uv/Idle.hpp | 5 +- .../main/native/include/wpi/net/uv/Loop.hpp | 5 +- .../include/wpi/net/uv/NetworkStream.hpp | 5 +- .../main/native/include/wpi/net/uv/Pipe.hpp | 5 +- .../main/native/include/wpi/net/uv/Poll.hpp | 5 +- .../native/include/wpi/net/uv/Prepare.hpp | 5 +- .../native/include/wpi/net/uv/Process.hpp | 5 +- .../native/include/wpi/net/uv/Request.hpp | 5 +- .../main/native/include/wpi/net/uv/Signal.hpp | 5 +- .../main/native/include/wpi/net/uv/Stream.hpp | 5 +- .../main/native/include/wpi/net/uv/Tcp.hpp | 5 +- .../main/native/include/wpi/net/uv/Timer.hpp | 5 +- .../main/native/include/wpi/net/uv/Tty.hpp | 5 +- .../main/native/include/wpi/net/uv/Udp.hpp | 5 +- .../main/native/include/wpi/net/uv/Work.hpp | 5 +- .../main/native/include/wpi/net/uv/util.hpp | 5 +- wpiutil/.styleguide | 51 --------- .../main/native/include/wpi/util/Base64.hpp | 6 +- .../include/wpi/util/CallbackManager.hpp | 5 +- .../main/native/include/wpi/util/Demangle.hpp | 5 +- .../main/native/include/wpi/util/Logger.hpp | 5 +- .../main/native/include/wpi/util/RawFrame.h | 5 +- .../native/include/wpi/util/SafeThread.hpp | 5 +- .../native/include/wpi/util/StackTrace.hpp | 5 +- .../native/include/wpi/util/UidVector.hpp | 5 +- .../native/include/wpi/util/deprecated.hpp | 5 +- .../include/wpi/util/fmt/raw_ostream.hpp | 5 +- .../main/native/include/wpi/util/future.hpp | 5 +- .../main/native/include/wpi/util/jni_util.hpp | 5 +- .../main/native/include/wpi/util/nodiscard.h | 5 +- .../include/wpi/util/priority_queue.hpp | 5 +- .../native/include/wpi/util/raw_istream.hpp | 5 +- .../src/main/native/include/wpi/util/sha1.hpp | 5 +- .../main/native/include/wpi/util/timestamp.h | 5 +- 117 files changed, 182 insertions(+), 873 deletions(-) delete mode 100644 cameraserver/.styleguide delete mode 100644 commandsv2/.styleguide delete mode 100644 commandsv3/.styleguide delete mode 100644 cscore/.styleguide delete mode 100644 datalog/.styleguide delete mode 100644 docs/.styleguide delete mode 100644 glass/.styleguide delete mode 100644 hal/.styleguide delete mode 100644 ntcore/.styleguide delete mode 100644 ntcoreffi/.styleguide delete mode 100644 romiVendordep/.styleguide delete mode 100644 tools/datalogtool/.styleguide delete mode 100644 tools/outlineviewer/.styleguide delete mode 100644 tools/sysid/.styleguide delete mode 100644 tools/wpical/.styleguide delete mode 100644 wpigui/.styleguide delete mode 100644 wpilibcExamples/.styleguide delete mode 100644 wpimath/.styleguide delete mode 100644 wpinet/.styleguide delete mode 100644 wpiutil/.styleguide diff --git a/.styleguide b/.styleguide index 0658c78717..f5da2f7ac8 100644 --- a/.styleguide +++ b/.styleguide @@ -1,5 +1,9 @@ +cHeaderFileInclude { + _c\.h$ +} + cppHeaderFileInclude { - \.h$ + (? #include @@ -49,5 +48,3 @@ class ConfigurableSourceImpl : public SourceImpl { }; } // namespace wpi::cs - -#endif // CSCORE_CONFIGURABLESOURCEIMPL_HPP_ diff --git a/cscore/src/main/native/cpp/Frame.hpp b/cscore/src/main/native/cpp/Frame.hpp index 51971027a6..c8673ebe32 100644 --- a/cscore/src/main/native/cpp/Frame.hpp +++ b/cscore/src/main/native/cpp/Frame.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_FRAME_HPP_ -#define CSCORE_FRAME_HPP_ +#pragma once #include #include @@ -251,5 +250,3 @@ class Frame { }; } // namespace wpi::cs - -#endif // CSCORE_FRAME_HPP_ diff --git a/cscore/src/main/native/cpp/Handle.hpp b/cscore/src/main/native/cpp/Handle.hpp index 94aa99b2fd..696609327d 100644 --- a/cscore/src/main/native/cpp/Handle.hpp +++ b/cscore/src/main/native/cpp/Handle.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_HANDLE_HPP_ -#define CSCORE_HANDLE_HPP_ +#pragma once #include "wpi/cs/cscore_c.h" #include "wpi/util/Synchronization.h" @@ -64,5 +63,3 @@ class Handle { }; } // namespace wpi::cs - -#endif // CSCORE_HANDLE_HPP_ diff --git a/cscore/src/main/native/cpp/HttpCameraImpl.hpp b/cscore/src/main/native/cpp/HttpCameraImpl.hpp index 6ef175c731..c2b595362b 100644 --- a/cscore/src/main/native/cpp/HttpCameraImpl.hpp +++ b/cscore/src/main/native/cpp/HttpCameraImpl.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_HTTPCAMERAIMPL_HPP_ -#define CSCORE_HTTPCAMERAIMPL_HPP_ +#pragma once #include #include @@ -159,5 +158,3 @@ class AxisCameraImpl : public HttpCameraImpl { }; } // namespace wpi::cs - -#endif // CSCORE_HTTPCAMERAIMPL_HPP_ diff --git a/cscore/src/main/native/cpp/Image.hpp b/cscore/src/main/native/cpp/Image.hpp index 867cacf00d..28a49d2f3f 100644 --- a/cscore/src/main/native/cpp/Image.hpp +++ b/cscore/src/main/native/cpp/Image.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_IMAGE_HPP_ -#define CSCORE_IMAGE_HPP_ +#pragma once #include #include @@ -130,5 +129,3 @@ class Image { }; } // namespace wpi::cs - -#endif // CSCORE_IMAGE_HPP_ diff --git a/cscore/src/main/native/cpp/Instance.hpp b/cscore/src/main/native/cpp/Instance.hpp index efdfb01c97..e07a7d3ac1 100644 --- a/cscore/src/main/native/cpp/Instance.hpp +++ b/cscore/src/main/native/cpp/Instance.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_INSTANCE_HPP_ -#define CSCORE_INSTANCE_HPP_ +#pragma once #include #include @@ -111,5 +110,3 @@ class Instance { }; } // namespace wpi::cs - -#endif // CSCORE_INSTANCE_HPP_ diff --git a/cscore/src/main/native/cpp/JpegUtil.hpp b/cscore/src/main/native/cpp/JpegUtil.hpp index 43560b6b24..48e19e21f9 100644 --- a/cscore/src/main/native/cpp/JpegUtil.hpp +++ b/cscore/src/main/native/cpp/JpegUtil.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_JPEGUTIL_HPP_ -#define CSCORE_JPEGUTIL_HPP_ +#pragma once #include #include @@ -26,5 +25,3 @@ bool ReadJpeg(wpi::util::raw_istream& is, std::string& buf, int* width, int* height); } // namespace wpi::cs - -#endif // CSCORE_JPEGUTIL_HPP_ diff --git a/cscore/src/main/native/cpp/Log.hpp b/cscore/src/main/native/cpp/Log.hpp index 913a3c377e..ec78f22c61 100644 --- a/cscore/src/main/native/cpp/Log.hpp +++ b/cscore/src/main/native/cpp/Log.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_LOG_HPP_ -#define CSCORE_LOG_HPP_ +#pragma once #include @@ -85,5 +84,3 @@ inline void NamedLog(wpi::util::Logger& logger, unsigned int level, #define SDEBUG4(format, ...) \ SLOG(::wpi::util::WPI_LOG_DEBUG4, format __VA_OPT__(, ) __VA_ARGS__) #endif - -#endif // CSCORE_LOG_HPP_ diff --git a/cscore/src/main/native/cpp/MjpegServerImpl.hpp b/cscore/src/main/native/cpp/MjpegServerImpl.hpp index ad9572e7f1..2397980f2b 100644 --- a/cscore/src/main/native/cpp/MjpegServerImpl.hpp +++ b/cscore/src/main/native/cpp/MjpegServerImpl.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_MJPEGSERVERIMPL_HPP_ -#define CSCORE_MJPEGSERVERIMPL_HPP_ +#pragma once #include #include @@ -63,5 +62,3 @@ class MjpegServerImpl : public SinkImpl { }; } // namespace wpi::cs - -#endif // CSCORE_MJPEGSERVERIMPL_HPP_ diff --git a/cscore/src/main/native/cpp/NetworkListener.hpp b/cscore/src/main/native/cpp/NetworkListener.hpp index 4eb3c0cd97..02c0319916 100644 --- a/cscore/src/main/native/cpp/NetworkListener.hpp +++ b/cscore/src/main/native/cpp/NetworkListener.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_NETWORKLISTENER_HPP_ -#define CSCORE_NETWORKLISTENER_HPP_ +#pragma once #include @@ -27,5 +26,3 @@ class NetworkListener { }; } // namespace wpi::cs - -#endif // CSCORE_NETWORKLISTENER_HPP_ diff --git a/cscore/src/main/native/cpp/Notifier.hpp b/cscore/src/main/native/cpp/Notifier.hpp index 2ee7b605a6..aef6557004 100644 --- a/cscore/src/main/native/cpp/Notifier.hpp +++ b/cscore/src/main/native/cpp/Notifier.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_NOTIFIER_HPP_ -#define CSCORE_NOTIFIER_HPP_ +#pragma once #include #include @@ -89,5 +88,3 @@ class Notifier }; } // namespace wpi::cs - -#endif // CSCORE_NOTIFIER_HPP_ diff --git a/cscore/src/main/native/cpp/PropertyContainer.hpp b/cscore/src/main/native/cpp/PropertyContainer.hpp index 71ef872631..b1f25439e1 100644 --- a/cscore/src/main/native/cpp/PropertyContainer.hpp +++ b/cscore/src/main/native/cpp/PropertyContainer.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_PROPERTYCONTAINER_HPP_ -#define CSCORE_PROPERTYCONTAINER_HPP_ +#pragma once #include #include @@ -125,5 +124,3 @@ class PropertyContainer { }; } // namespace wpi::cs - -#endif // CSCORE_PROPERTYCONTAINER_HPP_ diff --git a/cscore/src/main/native/cpp/PropertyImpl.hpp b/cscore/src/main/native/cpp/PropertyImpl.hpp index b53bc98963..adb343c7c1 100644 --- a/cscore/src/main/native/cpp/PropertyImpl.hpp +++ b/cscore/src/main/native/cpp/PropertyImpl.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_PROPERTYIMPL_HPP_ -#define CSCORE_PROPERTYIMPL_HPP_ +#pragma once #include #include @@ -49,5 +48,3 @@ class PropertyImpl { }; } // namespace wpi::cs - -#endif // CSCORE_PROPERTYIMPL_HPP_ diff --git a/cscore/src/main/native/cpp/RawSinkImpl.hpp b/cscore/src/main/native/cpp/RawSinkImpl.hpp index 8ffc75b197..ab4ed8e492 100644 --- a/cscore/src/main/native/cpp/RawSinkImpl.hpp +++ b/cscore/src/main/native/cpp/RawSinkImpl.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_RAWSINKIMPL_HPP_ -#define CSCORE_RAWSINKIMPL_HPP_ +#pragma once #include @@ -18,6 +17,7 @@ #include "wpi/util/condition_variable.hpp" namespace wpi::cs { + class SourceImpl; class RawSinkImpl : public SinkImpl { @@ -48,6 +48,5 @@ class RawSinkImpl : public SinkImpl { std::thread m_thread; std::function m_processFrame; }; -} // namespace wpi::cs -#endif // CSCORE_RAWSINKIMPL_HPP_ +} // namespace wpi::cs diff --git a/cscore/src/main/native/cpp/RawSourceImpl.hpp b/cscore/src/main/native/cpp/RawSourceImpl.hpp index e5ad762a6a..d1864a485d 100644 --- a/cscore/src/main/native/cpp/RawSourceImpl.hpp +++ b/cscore/src/main/native/cpp/RawSourceImpl.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_RAWSOURCEIMPL_HPP_ -#define CSCORE_RAWSOURCEIMPL_HPP_ +#pragma once #include #include @@ -33,5 +32,3 @@ class RawSourceImpl : public ConfigurableSourceImpl { }; } // namespace wpi::cs - -#endif // CSCORE_RAWSOURCEIMPL_HPP_ diff --git a/cscore/src/main/native/cpp/SinkImpl.hpp b/cscore/src/main/native/cpp/SinkImpl.hpp index 60da9a16cc..c1494d1436 100644 --- a/cscore/src/main/native/cpp/SinkImpl.hpp +++ b/cscore/src/main/native/cpp/SinkImpl.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_SINKIMPL_HPP_ -#define CSCORE_SINKIMPL_HPP_ +#pragma once #include #include @@ -73,5 +72,3 @@ class SinkImpl : public PropertyContainer { }; } // namespace wpi::cs - -#endif // CSCORE_SINKIMPL_HPP_ diff --git a/cscore/src/main/native/cpp/SourceImpl.hpp b/cscore/src/main/native/cpp/SourceImpl.hpp index fa4ac0b718..b2d64c10ad 100644 --- a/cscore/src/main/native/cpp/SourceImpl.hpp +++ b/cscore/src/main/native/cpp/SourceImpl.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_SOURCEIMPL_HPP_ -#define CSCORE_SOURCEIMPL_HPP_ +#pragma once #include #include @@ -194,5 +193,3 @@ class SourceImpl : public PropertyContainer { }; } // namespace wpi::cs - -#endif // CSCORE_SOURCEIMPL_HPP_ diff --git a/cscore/src/main/native/cpp/Telemetry.hpp b/cscore/src/main/native/cpp/Telemetry.hpp index 51defeb5f8..a6b5e24c41 100644 --- a/cscore/src/main/native/cpp/Telemetry.hpp +++ b/cscore/src/main/native/cpp/Telemetry.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_TELEMETRY_HPP_ -#define CSCORE_TELEMETRY_HPP_ +#pragma once #include "wpi/cs/cscore_cpp.hpp" #include "wpi/util/SafeThread.hpp" @@ -42,5 +41,3 @@ class Telemetry { }; } // namespace wpi::cs - -#endif // CSCORE_TELEMETRY_HPP_ diff --git a/cscore/src/main/native/cpp/UnlimitedHandleResource.hpp b/cscore/src/main/native/cpp/UnlimitedHandleResource.hpp index 953d49a3e7..020428b221 100644 --- a/cscore/src/main/native/cpp/UnlimitedHandleResource.hpp +++ b/cscore/src/main/native/cpp/UnlimitedHandleResource.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_UNLIMITEDHANDLERESOURCE_HPP_ -#define CSCORE_UNLIMITEDHANDLERESOURCE_HPP_ +#pragma once #include #include @@ -190,5 +189,3 @@ UnlimitedHandleResource::FindIf(F func) { } } // namespace wpi::cs - -#endif // CSCORE_UNLIMITEDHANDLERESOURCE_HPP_ diff --git a/cscore/src/main/native/cpp/UsbCameraListener.hpp b/cscore/src/main/native/cpp/UsbCameraListener.hpp index 750f6e8444..e6806abe46 100644 --- a/cscore/src/main/native/cpp/UsbCameraListener.hpp +++ b/cscore/src/main/native/cpp/UsbCameraListener.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_USBCAMERALISTENER_HPP_ -#define CSCORE_USBCAMERALISTENER_HPP_ +#pragma once #include @@ -27,5 +26,3 @@ class UsbCameraListener { }; } // namespace wpi::cs - -#endif // CSCORE_USBCAMERALISTENER_HPP_ diff --git a/cscore/src/main/native/cpp/c_util.hpp b/cscore/src/main/native/cpp/c_util.hpp index 5fc3c46bc3..f2a3b11e47 100644 --- a/cscore/src/main/native/cpp/c_util.hpp +++ b/cscore/src/main/native/cpp/c_util.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_C_UTIL_HPP_ -#define CSCORE_C_UTIL_HPP_ +#pragma once #include #include @@ -18,5 +17,3 @@ inline void ConvertToC(struct WPI_String* output, std::string_view str) { } } // namespace wpi::cs - -#endif // CSCORE_C_UTIL_HPP_ diff --git a/cscore/src/main/native/cpp/default_init_allocator.hpp b/cscore/src/main/native/cpp/default_init_allocator.hpp index 19de39a98c..0713cebbc1 100644 --- a/cscore/src/main/native/cpp/default_init_allocator.hpp +++ b/cscore/src/main/native/cpp/default_init_allocator.hpp @@ -2,8 +2,7 @@ // http://stackoverflow.com/questions/21028299/is-this-behavior-of-vectorresizesize-type-n-under-c11-and-boost-container // Credits: Casey and Howard Hinnant -#ifndef CSCORE_DEFAULT_INIT_ALLOCATOR_HPP_ -#define CSCORE_DEFAULT_INIT_ALLOCATOR_HPP_ +#pragma once #include #include @@ -37,5 +36,3 @@ class default_init_allocator : public A { }; } // namespace wpi::cs - -#endif // CSCORE_DEFAULT_INIT_ALLOCATOR_HPP_ diff --git a/cscore/src/main/native/include/wpi/cs/cscore.h b/cscore/src/main/native/include/wpi/cs/cscore.h index 44fffae4a4..88e0934638 100644 --- a/cscore/src/main/native/include/wpi/cs/cscore.h +++ b/cscore/src/main/native/include/wpi/cs/cscore.h @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_WPI_CS_CSCORE_H_ -#define CSCORE_WPI_CS_CSCORE_H_ +#pragma once /* C API */ #include "wpi/cs/cscore_c.h" @@ -13,5 +12,3 @@ #include "wpi/cs/cscore_cpp.hpp" #include "wpi/cs/cscore_oo.hpp" #endif /* __cplusplus */ - -#endif // CSCORE_WPI_CS_CSCORE_H_ diff --git a/cscore/src/main/native/include/wpi/cs/cscore_c.h b/cscore/src/main/native/include/wpi/cs/cscore_c.h index 9b333515da..b6cd79b493 100644 --- a/cscore/src/main/native/include/wpi/cs/cscore_c.h +++ b/cscore/src/main/native/include/wpi/cs/cscore_c.h @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_WPI_CS_CSCORE_C_H_ -#define CSCORE_WPI_CS_CSCORE_C_H_ +#pragma once #include @@ -527,5 +526,3 @@ struct WPI_String* CS_GetNetworkInterfaces(int* count); #ifdef __cplusplus } // extern "C" #endif - -#endif // CSCORE_WPI_CS_CSCORE_C_H_ diff --git a/cscore/src/main/native/include/wpi/cs/cscore_cpp.hpp b/cscore/src/main/native/include/wpi/cs/cscore_cpp.hpp index f2016a53d6..d1750679a7 100644 --- a/cscore/src/main/native/include/wpi/cs/cscore_cpp.hpp +++ b/cscore/src/main/native/include/wpi/cs/cscore_cpp.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_WPI_CS_CSCORE_CPP_HPP_ -#define CSCORE_WPI_CS_CSCORE_CPP_HPP_ +#pragma once #include @@ -456,5 +455,3 @@ std::vector GetNetworkInterfaces(); // Disable uninitialized variable warnings #pragma warning(pop) #endif - -#endif // CSCORE_WPI_CS_CSCORE_CPP_HPP_ diff --git a/cscore/src/main/native/include/wpi/cs/cscore_cv.hpp b/cscore/src/main/native/include/wpi/cs/cscore_cv.hpp index 591f9dc21e..b1ee3b5d45 100644 --- a/cscore/src/main/native/include/wpi/cs/cscore_cv.hpp +++ b/cscore/src/main/native/include/wpi/cs/cscore_cv.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_WPI_CS_CSCORE_CV_HPP_ -#define CSCORE_WPI_CS_CSCORE_CV_HPP_ +#pragma once #include @@ -432,5 +431,3 @@ inline WPI_TimestampSource CvSink::LastFrameTimeSource() { } } // namespace wpi::cs - -#endif // CSCORE_WPI_CS_CSCORE_CV_HPP_ diff --git a/cscore/src/main/native/include/wpi/cs/cscore_oo.hpp b/cscore/src/main/native/include/wpi/cs/cscore_oo.hpp index 065b2f644a..849e329489 100644 --- a/cscore/src/main/native/include/wpi/cs/cscore_oo.hpp +++ b/cscore/src/main/native/include/wpi/cs/cscore_oo.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_WPI_CS_CSCORE_OO_HPP_ -#define CSCORE_WPI_CS_CSCORE_OO_HPP_ +#pragma once #include #include @@ -1578,5 +1577,3 @@ class VideoListener { /** @} */ } // namespace wpi::cs - -#endif // CSCORE_WPI_CS_CSCORE_OO_HPP_ diff --git a/cscore/src/main/native/include/wpi/cs/cscore_raw.h b/cscore/src/main/native/include/wpi/cs/cscore_raw.h index 9b758c15ac..5d4f0a48c4 100644 --- a/cscore/src/main/native/include/wpi/cs/cscore_raw.h +++ b/cscore/src/main/native/include/wpi/cs/cscore_raw.h @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_WPI_CS_CSCORE_RAW_H_ -#define CSCORE_WPI_CS_CSCORE_RAW_H_ +#pragma once #include @@ -239,5 +238,3 @@ inline uint64_t RawSink::GrabFrameLastTime(wpi::util::RawFrame& image, } // namespace wpi::cs #endif - -#endif // CSCORE_WPI_CS_CSCORE_RAW_H_ diff --git a/cscore/src/main/native/linux/UsbCameraBuffer.hpp b/cscore/src/main/native/linux/UsbCameraBuffer.hpp index c2aa829325..61c10deb14 100644 --- a/cscore/src/main/native/linux/UsbCameraBuffer.hpp +++ b/cscore/src/main/native/linux/UsbCameraBuffer.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_USBCAMERABUFFER_HPP_ -#define CSCORE_USBCAMERABUFFER_HPP_ +#pragma once #include @@ -51,5 +50,3 @@ class UsbCameraBuffer { }; } // namespace wpi::cs - -#endif // CSCORE_USBCAMERABUFFER_HPP_ diff --git a/cscore/src/main/native/linux/UsbCameraImpl.hpp b/cscore/src/main/native/linux/UsbCameraImpl.hpp index 09b0af673b..203a42eea7 100644 --- a/cscore/src/main/native/linux/UsbCameraImpl.hpp +++ b/cscore/src/main/native/linux/UsbCameraImpl.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_USBCAMERAIMPL_HPP_ -#define CSCORE_USBCAMERAIMPL_HPP_ +#pragma once #include @@ -178,5 +177,3 @@ class UsbCameraImpl : public SourceImpl { }; } // namespace wpi::cs - -#endif // CSCORE_USBCAMERAIMPL_HPP_ diff --git a/cscore/src/main/native/linux/UsbCameraProperty.hpp b/cscore/src/main/native/linux/UsbCameraProperty.hpp index bb880d8da5..2af39bccac 100644 --- a/cscore/src/main/native/linux/UsbCameraProperty.hpp +++ b/cscore/src/main/native/linux/UsbCameraProperty.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_USBCAMERAPROPERTY_HPP_ -#define CSCORE_USBCAMERAPROPERTY_HPP_ +#pragma once #include @@ -74,5 +73,3 @@ class UsbCameraProperty : public PropertyImpl { }; } // namespace wpi::cs - -#endif // CSCORE_USBCAMERAPROPERTY_HPP_ diff --git a/cscore/src/main/native/linux/UsbUtil.hpp b/cscore/src/main/native/linux/UsbUtil.hpp index 207e95f1ea..ae378811dd 100644 --- a/cscore/src/main/native/linux/UsbUtil.hpp +++ b/cscore/src/main/native/linux/UsbUtil.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_USBUTIL_HPP_ -#define CSCORE_USBUTIL_HPP_ +#pragma once #include @@ -20,5 +19,3 @@ int CheckedIoctl(int fd, unsigned long req, void* data, // NOLINT(runtime/int) CheckedIoctl(fd, req, data, #req, __FILE__, __LINE__, true) } // namespace wpi::cs - -#endif // CSCORE_USBUTIL_HPP_ diff --git a/cscore/src/main/native/windows/UsbCameraImpl.hpp b/cscore/src/main/native/windows/UsbCameraImpl.hpp index 2192e39593..c31d39c49e 100644 --- a/cscore/src/main/native/windows/UsbCameraImpl.hpp +++ b/cscore/src/main/native/windows/UsbCameraImpl.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef CSCORE_USBCAMERAIMPL_HPP_ -#define CSCORE_USBCAMERAIMPL_HPP_ +#pragma once #include #include @@ -174,5 +173,3 @@ class UsbCameraImpl : public SourceImpl, }; } // namespace wpi::cs - -#endif // CSCORE_USBCAMERAIMPL_HPP_ diff --git a/datalog/.styleguide b/datalog/.styleguide deleted file mode 100644 index 317db43e1f..0000000000 --- a/datalog/.styleguide +++ /dev/null @@ -1,25 +0,0 @@ -cppHeaderFileInclude { - \.h$ - \.hpp$ -} - -cppSrcFileInclude { - \.cpp$ -} - -generatedFileExclude { - src/main/python/ - src/test/python/ -} - -licenseUpdateExclude { - examples/printlog -} - -modifiableFileExclude { - examples/printlog/datalog\.py$ -} - -repoRootNameOverride { - datalog -} diff --git a/docs/.styleguide b/docs/.styleguide deleted file mode 100644 index c2d4fd5053..0000000000 --- a/docs/.styleguide +++ /dev/null @@ -1,3 +0,0 @@ -generatedFileExclude { - theme.css -} diff --git a/glass/.styleguide b/glass/.styleguide deleted file mode 100644 index 3be6b4f48f..0000000000 --- a/glass/.styleguide +++ /dev/null @@ -1,20 +0,0 @@ -cppHeaderFileInclude { - \.h$ - \.hpp$ - \.inc$ - \.inl$ -} - -cppSrcFileInclude { - \.cpp$ -} - -generatedFileExclude { - src/app/native/resources/ - src/app/native/win/glass.ico - src/app/native/mac/glass.icns -} - -repoRootNameOverride { - glass -} diff --git a/hal/.styleguide b/hal/.styleguide deleted file mode 100644 index fec10d1175..0000000000 --- a/hal/.styleguide +++ /dev/null @@ -1,34 +0,0 @@ -cppHeaderFileInclude { - \.h$ - \.hpp$ - \.inc$ -} - -cppSrcFileInclude { - \.cpp$ -} - -generatedFileExclude { - hal/src/main/native/athena/ctre/ - hal/src/main/native/athena/rev/ - hal/src/main/native/athena/frccansae/ - hal/src/main/native/athena/visa/ - hal/src/main/native/include/ctre/ - hal/src/main/native/systemcore/ctre/ - hal/src/main/native/systemcore/rev/ - UsageReporting\.h$ - src/generated/main/native/cpp - - src/main/python/ - src/test/python/ -} - -modifiableFileExclude { - \.patch$ - \.png$ - \.so$ -} - -repoRootNameOverride { - hal -} diff --git a/hal/src/main/native/cpp/jni/HALUtil.h b/hal/src/main/native/cpp/jni/HALUtil.h index 88adab4acc..4b46482785 100644 --- a/hal/src/main/native/cpp/jni/HALUtil.h +++ b/hal/src/main/native/cpp/jni/HALUtil.h @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef HAL_HAL_SRC_MAIN_NATIVE_CPP_JNI_HALUTIL_H_ -#define HAL_HAL_SRC_MAIN_NATIVE_CPP_JNI_HALUTIL_H_ +#pragma once #include #include @@ -85,5 +84,3 @@ jobject CreateCANStreamMessage(JNIEnv* env); JavaVM* GetJVM(); } // namespace wpi::hal - -#endif // HAL_HAL_SRC_MAIN_NATIVE_CPP_JNI_HALUTIL_H_ diff --git a/ntcore/.styleguide b/ntcore/.styleguide deleted file mode 100644 index 3785189816..0000000000 --- a/ntcore/.styleguide +++ /dev/null @@ -1,33 +0,0 @@ -cHeaderFileInclude { - _c\.h$ -} - -cppHeaderFileInclude { - (? #include @@ -58,5 +57,3 @@ class EventLoopRunner { }; } // namespace wpi::net - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_EVENTLOOPRUNNER_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/HttpParser.hpp b/wpinet/src/main/native/include/wpi/net/HttpParser.hpp index 0a2473ffd1..28d6211de0 100644 --- a/wpinet/src/main/native/include/wpi/net/HttpParser.hpp +++ b/wpinet/src/main/native/include/wpi/net/HttpParser.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPPARSER_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPPARSER_HPP_ +#pragma once #include @@ -223,5 +222,3 @@ class HttpParser { }; } // namespace wpi::net - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPPARSER_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/HttpServerConnection.hpp b/wpinet/src/main/native/include/wpi/net/HttpServerConnection.hpp index 61bffd0146..47e07b6225 100644 --- a/wpinet/src/main/native/include/wpi/net/HttpServerConnection.hpp +++ b/wpinet/src/main/native/include/wpi/net/HttpServerConnection.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPSERVERCONNECTION_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPSERVERCONNECTION_HPP_ +#pragma once #include #include @@ -151,5 +150,3 @@ class HttpServerConnection { }; } // namespace wpi::net - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPSERVERCONNECTION_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/HttpUtil.hpp b/wpinet/src/main/native/include/wpi/net/HttpUtil.hpp index 797f6fe9eb..cd6fffc8a4 100644 --- a/wpinet/src/main/native/include/wpi/net/HttpUtil.hpp +++ b/wpinet/src/main/native/include/wpi/net/HttpUtil.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPUTIL_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPUTIL_HPP_ +#pragma once #include #include @@ -460,5 +459,3 @@ inline HttpPathRef HttpPath::drop_front(size_t n) const { } } // namespace wpi::net - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPUTIL_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/HttpWebSocketServerConnection.hpp b/wpinet/src/main/native/include/wpi/net/HttpWebSocketServerConnection.hpp index c5bea5d3d8..a4281f4a03 100644 --- a/wpinet/src/main/native/include/wpi/net/HttpWebSocketServerConnection.hpp +++ b/wpinet/src/main/native/include/wpi/net/HttpWebSocketServerConnection.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPWEBSOCKETSERVERCONNECTION_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPWEBSOCKETSERVERCONNECTION_HPP_ +#pragma once #include #include @@ -122,5 +121,3 @@ class HttpWebSocketServerConnection }; } // namespace wpi::net - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPWEBSOCKETSERVERCONNECTION_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/MimeTypes.hpp b/wpinet/src/main/native/include/wpi/net/MimeTypes.hpp index 032e9ab9d8..5aeb1432e7 100644 --- a/wpinet/src/main/native/include/wpi/net/MimeTypes.hpp +++ b/wpinet/src/main/native/include/wpi/net/MimeTypes.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_MIMETYPES_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_MIMETYPES_HPP_ +#pragma once #include @@ -12,5 +11,3 @@ namespace wpi::net { std::string_view MimeTypeFromPath(std::string_view path); } // namespace wpi::net - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_MIMETYPES_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/NetworkAcceptor.hpp b/wpinet/src/main/native/include/wpi/net/NetworkAcceptor.hpp index 50ad6e87ed..3b2859c31f 100644 --- a/wpinet/src/main/native/include/wpi/net/NetworkAcceptor.hpp +++ b/wpinet/src/main/native/include/wpi/net/NetworkAcceptor.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_NETWORKACCEPTOR_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_NETWORKACCEPTOR_HPP_ +#pragma once #include @@ -25,5 +24,3 @@ class NetworkAcceptor { }; } // namespace wpi::net - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_NETWORKACCEPTOR_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/NetworkStream.hpp b/wpinet/src/main/native/include/wpi/net/NetworkStream.hpp index c62de14642..007dbbc6ee 100644 --- a/wpinet/src/main/native/include/wpi/net/NetworkStream.hpp +++ b/wpinet/src/main/native/include/wpi/net/NetworkStream.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_NETWORKSTREAM_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_NETWORKSTREAM_HPP_ +#pragma once #include #include @@ -40,5 +39,3 @@ class NetworkStream { }; } // namespace wpi::net - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_NETWORKSTREAM_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/PortForwarder.hpp b/wpinet/src/main/native/include/wpi/net/PortForwarder.hpp index 6e5bf2c18c..b4f228668f 100644 --- a/wpinet/src/main/native/include/wpi/net/PortForwarder.hpp +++ b/wpinet/src/main/native/include/wpi/net/PortForwarder.hpp @@ -2,9 +2,6 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_PORTFORWARDER_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_PORTFORWARDER_HPP_ - #pragma once #include @@ -55,5 +52,3 @@ class PortForwarder { }; } // namespace wpi::net - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_PORTFORWARDER_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/SocketError.hpp b/wpinet/src/main/native/include/wpi/net/SocketError.hpp index f102d9fa5f..bb355fa698 100644 --- a/wpinet/src/main/native/include/wpi/net/SocketError.hpp +++ b/wpinet/src/main/native/include/wpi/net/SocketError.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_SOCKETERROR_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_SOCKETERROR_HPP_ +#pragma once #include @@ -18,5 +17,3 @@ inline std::string SocketStrerror() { } } // namespace wpi::net - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_SOCKETERROR_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/UDPClient.hpp b/wpinet/src/main/native/include/wpi/net/UDPClient.hpp index 95dc8097aa..25da95040d 100644 --- a/wpinet/src/main/native/include/wpi/net/UDPClient.hpp +++ b/wpinet/src/main/native/include/wpi/net/UDPClient.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UDPCLIENT_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UDPCLIENT_HPP_ +#pragma once #include #include @@ -47,5 +46,3 @@ class UDPClient { }; } // namespace wpi::net - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UDPCLIENT_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/UrlParser.hpp b/wpinet/src/main/native/include/wpi/net/UrlParser.hpp index 5c10464841..efd84533c1 100644 --- a/wpinet/src/main/native/include/wpi/net/UrlParser.hpp +++ b/wpinet/src/main/native/include/wpi/net/UrlParser.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_URLPARSER_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_URLPARSER_HPP_ +#pragma once #include @@ -91,5 +90,3 @@ class UrlParser { }; } // namespace wpi::net - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_URLPARSER_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/WebServer.hpp b/wpinet/src/main/native/include/wpi/net/WebServer.hpp index 9e9280c1df..2226d0b0be 100644 --- a/wpinet/src/main/native/include/wpi/net/WebServer.hpp +++ b/wpinet/src/main/native/include/wpi/net/WebServer.hpp @@ -2,9 +2,6 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WEBSERVER_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WEBSERVER_HPP_ - #pragma once #include @@ -54,5 +51,3 @@ class WebServer { }; } // namespace wpi::net - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WEBSERVER_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/WebSocket.hpp b/wpinet/src/main/native/include/wpi/net/WebSocket.hpp index 4cb8250bc8..863c26b62d 100644 --- a/wpinet/src/main/native/include/wpi/net/WebSocket.hpp +++ b/wpinet/src/main/native/include/wpi/net/WebSocket.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WEBSOCKET_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WEBSOCKET_HPP_ +#pragma once #include @@ -560,5 +559,3 @@ class WebSocket : public std::enable_shared_from_this { }; } // namespace wpi::net - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WEBSOCKET_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/WebSocketServer.hpp b/wpinet/src/main/native/include/wpi/net/WebSocketServer.hpp index 6bd82c6697..9e443b99be 100644 --- a/wpinet/src/main/native/include/wpi/net/WebSocketServer.hpp +++ b/wpinet/src/main/native/include/wpi/net/WebSocketServer.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WEBSOCKETSERVER_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WEBSOCKETSERVER_HPP_ +#pragma once #include #include @@ -186,5 +185,3 @@ class WebSocketServer : public std::enable_shared_from_this { }; } // namespace wpi::net - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WEBSOCKETSERVER_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/WorkerThread.hpp b/wpinet/src/main/native/include/wpi/net/WorkerThread.hpp index 6432161b29..f1526b104f 100644 --- a/wpinet/src/main/native/include/wpi/net/WorkerThread.hpp +++ b/wpinet/src/main/native/include/wpi/net/WorkerThread.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WORKERTHREAD_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WORKERTHREAD_HPP_ +#pragma once #include #include @@ -281,5 +280,3 @@ class WorkerThread final { }; } // namespace wpi::net - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WORKERTHREAD_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/hostname.hpp b/wpinet/src/main/native/include/wpi/net/hostname.hpp index 3857059319..39d51c7847 100644 --- a/wpinet/src/main/native/include/wpi/net/hostname.hpp +++ b/wpinet/src/main/native/include/wpi/net/hostname.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HOSTNAME_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HOSTNAME_HPP_ +#pragma once #include #include @@ -17,5 +16,3 @@ namespace wpi::net { std::string GetHostname(); std::string_view GetHostname(wpi::util::SmallVectorImpl& name); } // namespace wpi::net - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HOSTNAME_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/raw_socket_istream.hpp b/wpinet/src/main/native/include/wpi/net/raw_socket_istream.hpp index f61ab8470f..3fac99f582 100644 --- a/wpinet/src/main/native/include/wpi/net/raw_socket_istream.hpp +++ b/wpinet/src/main/native/include/wpi/net/raw_socket_istream.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_RAW_SOCKET_ISTREAM_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_RAW_SOCKET_ISTREAM_HPP_ +#pragma once #include "wpi/util/raw_istream.hpp" @@ -27,5 +26,3 @@ class raw_socket_istream : public wpi::util::raw_istream { }; } // namespace wpi::net - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_RAW_SOCKET_ISTREAM_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/raw_socket_ostream.hpp b/wpinet/src/main/native/include/wpi/net/raw_socket_ostream.hpp index b95bc1d794..a31c0d5e10 100644 --- a/wpinet/src/main/native/include/wpi/net/raw_socket_ostream.hpp +++ b/wpinet/src/main/native/include/wpi/net/raw_socket_ostream.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_RAW_SOCKET_OSTREAM_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_RAW_SOCKET_OSTREAM_HPP_ +#pragma once #include "wpi/util/raw_ostream.hpp" @@ -35,5 +34,3 @@ class raw_socket_ostream : public wpi::util::raw_ostream { }; } // namespace wpi::net - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_RAW_SOCKET_OSTREAM_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/raw_uv_ostream.hpp b/wpinet/src/main/native/include/wpi/net/raw_uv_ostream.hpp index b1b783f42e..1c96a9cd50 100644 --- a/wpinet/src/main/native/include/wpi/net/raw_uv_ostream.hpp +++ b/wpinet/src/main/native/include/wpi/net/raw_uv_ostream.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_RAW_UV_OSTREAM_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_RAW_UV_OSTREAM_HPP_ +#pragma once #include #include @@ -70,5 +69,3 @@ class raw_uv_ostream : public wpi::util::raw_ostream { }; } // namespace wpi::net - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_RAW_UV_OSTREAM_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/Async.hpp b/wpinet/src/main/native/include/wpi/net/uv/Async.hpp index 0ab0080d63..07f15caf83 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/Async.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/Async.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_ASYNC_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_ASYNC_HPP_ +#pragma once #include #include @@ -197,5 +196,3 @@ class Async<> final : public HandleImpl, uv_async_t> { }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_ASYNC_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/AsyncFunction.hpp b/wpinet/src/main/native/include/wpi/net/uv/AsyncFunction.hpp index 696e95497f..fe34405ba6 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/AsyncFunction.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/AsyncFunction.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_ASYNCFUNCTION_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_ASYNCFUNCTION_HPP_ +#pragma once #include @@ -177,5 +176,3 @@ class AsyncFunction final }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_ASYNCFUNCTION_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/Buffer.hpp b/wpinet/src/main/native/include/wpi/net/uv/Buffer.hpp index a9476faca6..446dd1884f 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/Buffer.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/Buffer.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_BUFFER_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_BUFFER_HPP_ +#pragma once #include #include @@ -172,5 +171,3 @@ class SimpleBufferPool { }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_BUFFER_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/Check.hpp b/wpinet/src/main/native/include/wpi/net/uv/Check.hpp index e88cc0f94e..afc7a573ce 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/Check.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/Check.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_CHECK_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_CHECK_HPP_ +#pragma once #include @@ -61,5 +60,3 @@ class Check final : public HandleImpl { }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_CHECK_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/Error.hpp b/wpinet/src/main/native/include/wpi/net/uv/Error.hpp index fc79763391..25a684390a 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/Error.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/Error.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_ERROR_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_ERROR_HPP_ +#pragma once #include @@ -42,5 +41,3 @@ class Error { }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_ERROR_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/FsEvent.hpp b/wpinet/src/main/native/include/wpi/net/uv/FsEvent.hpp index 5365aea7c1..a545195923 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/FsEvent.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/FsEvent.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_FSEVENT_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_FSEVENT_HPP_ +#pragma once #include #include @@ -75,5 +74,3 @@ class FsEvent final : public HandleImpl { }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_FSEVENT_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/GetAddrInfo.hpp b/wpinet/src/main/native/include/wpi/net/uv/GetAddrInfo.hpp index ce81047cd5..cf1a7e20b4 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/GetAddrInfo.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/GetAddrInfo.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_GETADDRINFO_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_GETADDRINFO_HPP_ +#pragma once #include #include @@ -116,5 +115,3 @@ inline void GetAddrInfo(const std::shared_ptr& loop, } } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_GETADDRINFO_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/GetNameInfo.hpp b/wpinet/src/main/native/include/wpi/net/uv/GetNameInfo.hpp index d915b32771..af636e4910 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/GetNameInfo.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/GetNameInfo.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_GETNAMEINFO_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_GETNAMEINFO_HPP_ +#pragma once #include #include @@ -223,5 +222,3 @@ inline void GetNameInfo6(const std::shared_ptr& loop, } } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_GETNAMEINFO_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/Handle.hpp b/wpinet/src/main/native/include/wpi/net/uv/Handle.hpp index 2add8af18d..9a33e77c36 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/Handle.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/Handle.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_HANDLE_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_HANDLE_HPP_ +#pragma once #include #include @@ -310,5 +309,3 @@ class HandleImpl : public Handle { }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_HANDLE_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/Idle.hpp b/wpinet/src/main/native/include/wpi/net/uv/Idle.hpp index edc5c97a36..658d796631 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/Idle.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/Idle.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_IDLE_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_IDLE_HPP_ +#pragma once #include @@ -70,5 +69,3 @@ class Idle final : public HandleImpl { }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_IDLE_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/Loop.hpp b/wpinet/src/main/native/include/wpi/net/uv/Loop.hpp index db5747a362..b2358795b2 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/Loop.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/Loop.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_LOOP_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_LOOP_HPP_ +#pragma once #include #include @@ -264,5 +263,3 @@ class Loop final : public std::enable_shared_from_this { }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_LOOP_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/NetworkStream.hpp b/wpinet/src/main/native/include/wpi/net/uv/NetworkStream.hpp index 180f4aaebb..9c1493d5cb 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/NetworkStream.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/NetworkStream.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_NETWORKSTREAM_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_NETWORKSTREAM_HPP_ +#pragma once #include #include @@ -149,5 +148,3 @@ class NetworkStreamImpl : public NetworkStream { }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_NETWORKSTREAM_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/Pipe.hpp b/wpinet/src/main/native/include/wpi/net/uv/Pipe.hpp index 5d5ac84f94..c9ab2dbac5 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/Pipe.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/Pipe.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_PIPE_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_PIPE_HPP_ +#pragma once #include #include @@ -204,5 +203,3 @@ class PipeConnectReq : public ConnectReq { }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_PIPE_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/Poll.hpp b/wpinet/src/main/native/include/wpi/net/uv/Poll.hpp index 4688e86c45..906b9575ff 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/Poll.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/Poll.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_POLL_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_POLL_HPP_ +#pragma once #include #include @@ -118,5 +117,3 @@ class Poll final : public HandleImpl { }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_POLL_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/Prepare.hpp b/wpinet/src/main/native/include/wpi/net/uv/Prepare.hpp index 415b141d5c..dbf91a01d1 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/Prepare.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/Prepare.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_PREPARE_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_PREPARE_HPP_ +#pragma once #include @@ -61,5 +60,3 @@ class Prepare final : public HandleImpl { }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_PREPARE_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/Process.hpp b/wpinet/src/main/native/include/wpi/net/uv/Process.hpp index 01f75bbb45..bd33f2eb27 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/Process.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/Process.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_PROCESS_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_PROCESS_HPP_ +#pragma once #include #include @@ -306,5 +305,3 @@ class Process final : public HandleImpl { }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_PROCESS_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/Request.hpp b/wpinet/src/main/native/include/wpi/net/uv/Request.hpp index b4f8a582e9..9ce6a73998 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/Request.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/Request.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_REQUEST_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_REQUEST_HPP_ +#pragma once #include #include @@ -167,5 +166,3 @@ class RequestImpl : public Request { }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_REQUEST_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/Signal.hpp b/wpinet/src/main/native/include/wpi/net/uv/Signal.hpp index 9f63cfd64b..97c0b7ac9d 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/Signal.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/Signal.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_SIGNAL_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_SIGNAL_HPP_ +#pragma once #include @@ -75,5 +74,3 @@ class Signal final : public HandleImpl { }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_SIGNAL_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/Stream.hpp b/wpinet/src/main/native/include/wpi/net/uv/Stream.hpp index c9145c161b..0104c0061e 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/Stream.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/Stream.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_STREAM_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_STREAM_HPP_ +#pragma once #include #include @@ -330,5 +329,3 @@ class StreamImpl : public Stream { }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_STREAM_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/Tcp.hpp b/wpinet/src/main/native/include/wpi/net/uv/Tcp.hpp index 39a644e23b..2780f06c82 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/Tcp.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/Tcp.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_TCP_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_TCP_HPP_ +#pragma once #include #include @@ -367,5 +366,3 @@ class TcpConnectReq : public ConnectReq { }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_TCP_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/Timer.hpp b/wpinet/src/main/native/include/wpi/net/uv/Timer.hpp index 6f6d8f6ca6..3b1bf123e4 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/Timer.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/Timer.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_TIMER_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_TIMER_HPP_ +#pragma once #include #include @@ -140,5 +139,3 @@ class Timer final : public HandleImpl { }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_TIMER_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/Tty.hpp b/wpinet/src/main/native/include/wpi/net/uv/Tty.hpp index ecdc23a055..b330896ebb 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/Tty.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/Tty.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_TTY_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_TTY_HPP_ +#pragma once #include #include @@ -81,5 +80,3 @@ class Tty final : public StreamImpl { }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_TTY_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/Udp.hpp b/wpinet/src/main/native/include/wpi/net/uv/Udp.hpp index 404b367593..a23f385082 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/Udp.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/Udp.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_UDP_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_UDP_HPP_ +#pragma once #include #include @@ -394,5 +393,3 @@ class Udp final : public HandleImpl { }; } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_UDP_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/Work.hpp b/wpinet/src/main/native/include/wpi/net/uv/Work.hpp index 366037cca0..fad2e2e45f 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/Work.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/Work.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_WORK_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_WORK_HPP_ +#pragma once #include #include @@ -89,5 +88,3 @@ inline void QueueWork(const std::shared_ptr& loop, } } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_WORK_HPP_ diff --git a/wpinet/src/main/native/include/wpi/net/uv/util.hpp b/wpinet/src/main/native/include/wpi/net/uv/util.hpp index fee1d669e5..81c3088ba7 100644 --- a/wpinet/src/main/native/include/wpi/net/uv/util.hpp +++ b/wpinet/src/main/native/include/wpi/net/uv/util.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_UTIL_HPP_ -#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_UTIL_HPP_ +#pragma once #include #include @@ -154,5 +153,3 @@ int NameToAddr(std::string_view ip, in_addr* addr); int NameToAddr(std::string_view ip, in6_addr* addr); } // namespace wpi::net::uv - -#endif // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_UTIL_HPP_ diff --git a/wpiutil/.styleguide b/wpiutil/.styleguide deleted file mode 100644 index 5371065b95..0000000000 --- a/wpiutil/.styleguide +++ /dev/null @@ -1,51 +0,0 @@ -cppHeaderFileInclude { - \.h$ - \.hpp$ - \.inc$ - \.inl$ - expected$ - math$ - numbers$ - scope$ -} - -cppSrcFileInclude { - \.cpp$ -} - -modifiableFileExclude { - src/main/native/include/wpi/util/MulticastServiceAnnouncer\.h$ -} - -generatedFileExclude { - src/main/native/thirdparty/ - - src/main/python/ - src/test/python/ - - src/main/native/include/wpi/util/fs\.hpp$ - src/main/native/include/wpi/util/FastQueue\.hpp$ - src/main/native/cpp/fs\.cpp$ - src/main/native/resources/ - src/main/native/windows/StackWalker - src/test/native/cpp/llvm/ - src/test/native/cpp/span/ - src/test/native/cpp/json/ - src/generated/test/native/cpp -} - -licenseUpdateExclude { - src/main/native/cpp/Base64\.cpp$ - src/main/native/cpp/sha1\.cpp$ - src/main/native/include/wpi/util/sha1\.hpp$ -} - -repoRootNameOverride { - wpiutil -} - -includeGuardRoots { - wpiutil/src/main/native/cpp/ - wpiutil/src/main/native/include/ - wpiutil/src/test/native/cpp/ -} diff --git a/wpiutil/src/main/native/include/wpi/util/Base64.hpp b/wpiutil/src/main/native/include/wpi/util/Base64.hpp index e6271410b4..b5e44c34a9 100644 --- a/wpiutil/src/main/native/include/wpi/util/Base64.hpp +++ b/wpiutil/src/main/native/include/wpi/util/Base64.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UTIL_BASE64_HPP_ -#define WPIUTIL_WPI_UTIL_BASE64_HPP_ +#pragma once #include @@ -14,6 +13,7 @@ #include namespace wpi::util { + template class SmallVectorImpl; class raw_ostream; @@ -45,5 +45,3 @@ std::string_view Base64Encode(std::span plain, SmallVectorImpl& buf); } // namespace wpi::util - -#endif // WPIUTIL_WPI_UTIL_BASE64_HPP_ diff --git a/wpiutil/src/main/native/include/wpi/util/CallbackManager.hpp b/wpiutil/src/main/native/include/wpi/util/CallbackManager.hpp index d3a359276a..6442026106 100644 --- a/wpiutil/src/main/native/include/wpi/util/CallbackManager.hpp +++ b/wpiutil/src/main/native/include/wpi/util/CallbackManager.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UTIL_CALLBACKMANAGER_HPP_ -#define WPIUTIL_WPI_UTIL_CALLBACKMANAGER_HPP_ +#pragma once #include #include @@ -391,5 +390,3 @@ class CallbackManager { }; } // namespace wpi::util - -#endif // WPIUTIL_WPI_UTIL_CALLBACKMANAGER_HPP_ diff --git a/wpiutil/src/main/native/include/wpi/util/Demangle.hpp b/wpiutil/src/main/native/include/wpi/util/Demangle.hpp index b44ba74e64..3348a829e7 100644 --- a/wpiutil/src/main/native/include/wpi/util/Demangle.hpp +++ b/wpiutil/src/main/native/include/wpi/util/Demangle.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UTIL_DEMANGLE_HPP_ -#define WPIUTIL_WPI_UTIL_DEMANGLE_HPP_ +#pragma once #include #include @@ -29,5 +28,3 @@ std::string GetTypeName(const T& type) { } } // namespace wpi::util - -#endif // WPIUTIL_WPI_UTIL_DEMANGLE_HPP_ diff --git a/wpiutil/src/main/native/include/wpi/util/Logger.hpp b/wpiutil/src/main/native/include/wpi/util/Logger.hpp index 3c6d69ab3e..28642d2cd6 100644 --- a/wpiutil/src/main/native/include/wpi/util/Logger.hpp +++ b/wpiutil/src/main/native/include/wpi/util/Logger.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UTIL_LOGGER_HPP_ -#define WPIUTIL_WPI_UTIL_LOGGER_HPP_ +#pragma once #include #include @@ -90,5 +89,3 @@ class Logger { WPI_LOG(inst, ::wpi::util::WPI_LOG_DEBUG4, format __VA_OPT__(, ) __VA_ARGS__) } // namespace wpi::util - -#endif // WPIUTIL_WPI_UTIL_LOGGER_HPP_ diff --git a/wpiutil/src/main/native/include/wpi/util/RawFrame.h b/wpiutil/src/main/native/include/wpi/util/RawFrame.h index d4dafa51d8..d5d3d1b2e5 100644 --- a/wpiutil/src/main/native/include/wpi/util/RawFrame.h +++ b/wpiutil/src/main/native/include/wpi/util/RawFrame.h @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UTIL_RAWFRAME_H_ -#define WPIUTIL_WPI_UTIL_RAWFRAME_H_ +#pragma once #include @@ -162,5 +161,3 @@ void SetFrameData(JNIEnv* env, jclass rawFrameCls, jobject jframe, } // namespace wpi::util #endif - -#endif // WPIUTIL_WPI_UTIL_RAWFRAME_H_ diff --git a/wpiutil/src/main/native/include/wpi/util/SafeThread.hpp b/wpiutil/src/main/native/include/wpi/util/SafeThread.hpp index 536f995e3c..6b7f8c80bd 100644 --- a/wpiutil/src/main/native/include/wpi/util/SafeThread.hpp +++ b/wpiutil/src/main/native/include/wpi/util/SafeThread.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UTIL_SAFETHREAD_HPP_ -#define WPIUTIL_WPI_UTIL_SAFETHREAD_HPP_ +#pragma once #include #include @@ -141,5 +140,3 @@ class SafeThreadOwner : public detail::SafeThreadOwnerBase { }; } // namespace wpi::util - -#endif // WPIUTIL_WPI_UTIL_SAFETHREAD_HPP_ diff --git a/wpiutil/src/main/native/include/wpi/util/StackTrace.hpp b/wpiutil/src/main/native/include/wpi/util/StackTrace.hpp index ca82ceb832..be727e6518 100644 --- a/wpiutil/src/main/native/include/wpi/util/StackTrace.hpp +++ b/wpiutil/src/main/native/include/wpi/util/StackTrace.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UTIL_STACKTRACE_HPP_ -#define WPIUTIL_WPI_UTIL_STACKTRACE_HPP_ +#pragma once #include @@ -31,5 +30,3 @@ std::string GetStackTraceDefault(int offset); void SetGetStackTraceImpl(std::string (*func)(int offset)); } // namespace wpi::util - -#endif // WPIUTIL_WPI_UTIL_STACKTRACE_HPP_ diff --git a/wpiutil/src/main/native/include/wpi/util/UidVector.hpp b/wpiutil/src/main/native/include/wpi/util/UidVector.hpp index 3b354e0ca2..41d78aad84 100644 --- a/wpiutil/src/main/native/include/wpi/util/UidVector.hpp +++ b/wpiutil/src/main/native/include/wpi/util/UidVector.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UTIL_UIDVECTOR_HPP_ -#define WPIUTIL_WPI_UTIL_UIDVECTOR_HPP_ +#pragma once #include #include @@ -155,5 +154,3 @@ class UidVector { }; } // namespace wpi::util - -#endif // WPIUTIL_WPI_UTIL_UIDVECTOR_HPP_ diff --git a/wpiutil/src/main/native/include/wpi/util/deprecated.hpp b/wpiutil/src/main/native/include/wpi/util/deprecated.hpp index 9517a0f8ab..571e1b33ec 100644 --- a/wpiutil/src/main/native/include/wpi/util/deprecated.hpp +++ b/wpiutil/src/main/native/include/wpi/util/deprecated.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UTIL_DEPRECATED_HPP_ -#define WPIUTIL_WPI_UTIL_DEPRECATED_HPP_ +#pragma once #ifndef WPI_IGNORE_DEPRECATED #ifdef __GNUC__ @@ -27,5 +26,3 @@ #define WPI_UNIGNORE_DEPRECATED #endif #endif - -#endif // WPIUTIL_WPI_UTIL_DEPRECATED_HPP_ diff --git a/wpiutil/src/main/native/include/wpi/util/fmt/raw_ostream.hpp b/wpiutil/src/main/native/include/wpi/util/fmt/raw_ostream.hpp index 77f9528e6e..a80a70a7cd 100644 --- a/wpiutil/src/main/native/include/wpi/util/fmt/raw_ostream.hpp +++ b/wpiutil/src/main/native/include/wpi/util/fmt/raw_ostream.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UTIL_FMT_RAW_OSTREAM_HPP_ -#define WPIUTIL_WPI_UTIL_FMT_RAW_OSTREAM_HPP_ +#pragma once #include @@ -27,5 +26,3 @@ void print(wpi::util::raw_ostream& os, const S& format_str, Args&&... args) { } } // namespace wpi::util - -#endif // WPIUTIL_WPI_UTIL_FMT_RAW_OSTREAM_HPP_ diff --git a/wpiutil/src/main/native/include/wpi/util/future.hpp b/wpiutil/src/main/native/include/wpi/util/future.hpp index beca9b5685..f5a876b0c5 100644 --- a/wpiutil/src/main/native/include/wpi/util/future.hpp +++ b/wpiutil/src/main/native/include/wpi/util/future.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UTIL_FUTURE_HPP_ -#define WPIUTIL_WPI_UTIL_FUTURE_HPP_ +#pragma once #include @@ -939,5 +938,3 @@ future detail::FutureThen::Create( } } // namespace wpi::util - -#endif // WPIUTIL_WPI_UTIL_FUTURE_HPP_ diff --git a/wpiutil/src/main/native/include/wpi/util/jni_util.hpp b/wpiutil/src/main/native/include/wpi/util/jni_util.hpp index fb7b05423f..9f2e5c5d2a 100644 --- a/wpiutil/src/main/native/include/wpi/util/jni_util.hpp +++ b/wpiutil/src/main/native/include/wpi/util/jni_util.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UTIL_JNI_UTIL_HPP_ -#define WPIUTIL_WPI_UTIL_JNI_UTIL_HPP_ +#pragma once #include @@ -978,5 +977,3 @@ struct JExceptionInit { }; } // namespace wpi::util::java - -#endif // WPIUTIL_WPI_UTIL_JNI_UTIL_HPP_ diff --git a/wpiutil/src/main/native/include/wpi/util/nodiscard.h b/wpiutil/src/main/native/include/wpi/util/nodiscard.h index f1c280f0fc..d1cfc9431c 100644 --- a/wpiutil/src/main/native/include/wpi/util/nodiscard.h +++ b/wpiutil/src/main/native/include/wpi/util/nodiscard.h @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UTIL_NODISCARD_H_ -#define WPIUTIL_WPI_UTIL_NODISCARD_H_ +#pragma once // This should only be used on APIs that can be compiled as C or C++. If the API // is C++ only, use [[nodiscard]] instead. @@ -17,5 +16,3 @@ #endif #endif - -#endif // WPIUTIL_WPI_UTIL_NODISCARD_H_ diff --git a/wpiutil/src/main/native/include/wpi/util/priority_queue.hpp b/wpiutil/src/main/native/include/wpi/util/priority_queue.hpp index d3c55ce00e..879c00e628 100644 --- a/wpiutil/src/main/native/include/wpi/util/priority_queue.hpp +++ b/wpiutil/src/main/native/include/wpi/util/priority_queue.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UTIL_PRIORITY_QUEUE_HPP_ -#define WPIUTIL_WPI_UTIL_PRIORITY_QUEUE_HPP_ +#pragma once #include #include @@ -112,5 +111,3 @@ class priority_queue { }; } // namespace wpi::util - -#endif // WPIUTIL_WPI_UTIL_PRIORITY_QUEUE_HPP_ diff --git a/wpiutil/src/main/native/include/wpi/util/raw_istream.hpp b/wpiutil/src/main/native/include/wpi/util/raw_istream.hpp index ca87b6ce75..803a69f410 100644 --- a/wpiutil/src/main/native/include/wpi/util/raw_istream.hpp +++ b/wpiutil/src/main/native/include/wpi/util/raw_istream.hpp @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UTIL_RAW_ISTREAM_HPP_ -#define WPIUTIL_WPI_UTIL_RAW_ISTREAM_HPP_ +#pragma once #include @@ -172,5 +171,3 @@ class raw_fd_istream : public raw_istream { }; } // namespace wpi::util - -#endif // WPIUTIL_WPI_UTIL_RAW_ISTREAM_HPP_ diff --git a/wpiutil/src/main/native/include/wpi/util/sha1.hpp b/wpiutil/src/main/native/include/wpi/util/sha1.hpp index 855da55818..82a37d6c4a 100644 --- a/wpiutil/src/main/native/include/wpi/util/sha1.hpp +++ b/wpiutil/src/main/native/include/wpi/util/sha1.hpp @@ -17,8 +17,7 @@ -- Eugene Hopkinson */ -#ifndef WPIUTIL_WPI_UTIL_SHA1_HPP_ -#define WPIUTIL_WPI_UTIL_SHA1_HPP_ +#pragma once #include @@ -48,5 +47,3 @@ class SHA1 { }; } // namespace wpi::util - -#endif // WPIUTIL_WPI_UTIL_SHA1_HPP_ diff --git a/wpiutil/src/main/native/include/wpi/util/timestamp.h b/wpiutil/src/main/native/include/wpi/util/timestamp.h index 2f6df2f32b..5bbea915f8 100644 --- a/wpiutil/src/main/native/include/wpi/util/timestamp.h +++ b/wpiutil/src/main/native/include/wpi/util/timestamp.h @@ -2,8 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UTIL_TIMESTAMP_H_ -#define WPIUTIL_WPI_UTIL_TIMESTAMP_H_ +#pragma once #include @@ -85,5 +84,3 @@ uint64_t GetSystemTime(); } // namespace wpi::util #endif - -#endif // WPIUTIL_WPI_UTIL_TIMESTAMP_H_