Run wpiformat on merged repo (#1021)

2026-06-24 01:31:46 +00:00 · 2018-05-13 17:09:56 -07:00
parent 0babbf317c
commit 6729a7d6b1
481 changed files with 9581 additions and 6828 deletions
--- a/wpiutil/src/main/native/include/support/Base64.h
+++ b/wpiutil/src/main/native/include/support/Base64.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/Base64.h is deprecated; include wpi/Base64.h instead"
 #else
 #warning "support/Base64.h is deprecated; include wpi/Base64.h instead"
 #endif

+// clang-format on
+
 #include "wpi/Base64.h"
--- a/wpiutil/src/main/native/include/support/ConcurrentQueue.h
+++ b/wpiutil/src/main/native/include/support/ConcurrentQueue.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/ConcurrentQueue.h is deprecated; include wpi/ConcurrentQueue.h instead"
 #else
 #warning "support/ConcurrentQueue.h is deprecated; include wpi/ConcurrentQueue.h instead"
 #endif

+// clang-format on
+
 #include "wpi/ConcurrentQueue.h"
--- a/wpiutil/src/main/native/include/support/HttpUtil.h
+++ b/wpiutil/src/main/native/include/support/HttpUtil.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/HttpUtil.h is deprecated; include wpi/HttpUtil.h instead"
 #else
 #warning "support/HttpUtil.h is deprecated; include wpi/HttpUtil.h instead"
 #endif

+// clang-format on
+
 #include "wpi/HttpUtil.h"
--- a/wpiutil/src/main/native/include/support/HttpUtil.inl
+++ b/wpiutil/src/main/native/include/support/HttpUtil.inl
@@ -7,10 +7,12 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/HttpUtil.inl is deprecated; include wpi/HttpUtil.inl instead"
 #else
 #warning "support/HttpUtil.inl is deprecated; include wpi/HttpUtil.inl instead"
 #endif
+// clang-format on

 #include "wpi/HttpUtil.inl"
--- a/wpiutil/src/main/native/include/support/Logger.h
+++ b/wpiutil/src/main/native/include/support/Logger.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/Logger.h is deprecated; include wpi/Logger.h instead"
 #else
 #warning "support/Logger.h is deprecated; include wpi/Logger.h instead"
 #endif

+// clang-format on
+
 #include "wpi/Logger.h"
--- a/wpiutil/src/main/native/include/support/SafeThread.h
+++ b/wpiutil/src/main/native/include/support/SafeThread.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/SafeThread.h is deprecated; include wpi/SafeThread.h instead"
 #else
 #warning "support/SafeThread.h is deprecated; include wpi/SafeThread.h instead"
 #endif

+// clang-format on
+
 #include "wpi/SafeThread.h"
--- a/wpiutil/src/main/native/include/support/UidVector.h
+++ b/wpiutil/src/main/native/include/support/UidVector.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/UidVector.h is deprecated; include wpi/UidVector.h instead"
 #else
 #warning "support/UidVector.h is deprecated; include wpi/UidVector.h instead"
 #endif

+// clang-format on
+
 #include "wpi/UidVector.h"
--- a/wpiutil/src/main/native/include/support/atomic_static.h
+++ b/wpiutil/src/main/native/include/support/atomic_static.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/atomic_static.h is deprecated; include wpi/atomic_static.h instead"
 #else
 #warning "support/atomic_static.h is deprecated; include wpi/atomic_static.h instead"
 #endif

+// clang-format on
+
 #include "wpi/atomic_static.h"
--- a/wpiutil/src/main/native/include/support/condition_variable.h
+++ b/wpiutil/src/main/native/include/support/condition_variable.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/condition_variable.h is deprecated; include wpi/condition_variable.h instead"
 #else
 #warning "support/condition_variable.h is deprecated; include wpi/condition_variable.h instead"
 #endif

+// clang-format on
+
 #include "wpi/condition_variable.h"
--- a/wpiutil/src/main/native/include/support/deprecated.h
+++ b/wpiutil/src/main/native/include/support/deprecated.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/deprecated.h is deprecated; include wpi/deprecated.h instead"
 #else
 #warning "support/deprecated.h is deprecated; include wpi/deprecated.h instead"
 #endif

+// clang-format on
+
 #include "wpi/deprecated.h"
--- a/wpiutil/src/main/native/include/support/hostname.h
+++ b/wpiutil/src/main/native/include/support/hostname.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/hostname.h is deprecated; include wpi/hostname.h instead"
 #else
 #warning "support/hostname.h is deprecated; include wpi/hostname.h instead"
 #endif

+// clang-format on
+
 #include "wpi/hostname.h"
--- a/wpiutil/src/main/native/include/support/jni_util.h
+++ b/wpiutil/src/main/native/include/support/jni_util.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/jni_util.h is deprecated; include wpi/jni_util.h instead"
 #else
 #warning "support/jni_util.h is deprecated; include wpi/jni_util.h instead"
 #endif

+// clang-format on
+
 #include "wpi/jni_util.h"
--- a/wpiutil/src/main/native/include/support/json.h
+++ b/wpiutil/src/main/native/include/support/json.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/json.h is deprecated; include wpi/json.h instead"
 #else
 #warning "support/json.h is deprecated; include wpi/json.h instead"
 #endif

+// clang-format on
+
 #include "wpi/json.h"
--- a/wpiutil/src/main/native/include/support/leb128.h
+++ b/wpiutil/src/main/native/include/support/leb128.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/leb128.h is deprecated; include wpi/leb128.h instead"
 #else
 #warning "support/leb128.h is deprecated; include wpi/leb128.h instead"
 #endif

+// clang-format on
+
 #include "wpi/leb128.h"
--- a/wpiutil/src/main/native/include/support/mutex.h
+++ b/wpiutil/src/main/native/include/support/mutex.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/mutex.h is deprecated; include wpi/mutex.h instead"
 #else
 #warning "support/mutex.h is deprecated; include wpi/mutex.h instead"
 #endif

+// clang-format on
+
 #include "wpi/mutex.h"
--- a/wpiutil/src/main/native/include/support/priority_condition_variable.h
+++ b/wpiutil/src/main/native/include/support/priority_condition_variable.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/priority_condition_variable.h is deprecated; include wpi/priority_condition_variable.h instead"
 #else
 #warning "support/priority_condition_variable.h is deprecated; include wpi/priority_condition_variable.h instead"
 #endif

+// clang-format on
+
 #include "wpi/priority_condition_variable.h"
--- a/wpiutil/src/main/native/include/support/priority_mutex.h
+++ b/wpiutil/src/main/native/include/support/priority_mutex.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/priority_mutex.h is deprecated; include wpi/priority_mutex.h instead"
 #else
 #warning "support/priority_mutex.h is deprecated; include wpi/priority_mutex.h instead"
 #endif

+// clang-format on
+
 #include "wpi/priority_mutex.h"
--- a/wpiutil/src/main/native/include/support/raw_istream.h
+++ b/wpiutil/src/main/native/include/support/raw_istream.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/raw_istream.h is deprecated; include wpi/raw_istream.h instead"
 #else
 #warning "support/raw_istream.h is deprecated; include wpi/raw_istream.h instead"
 #endif

+// clang-format on
+
 #include "wpi/raw_istream.h"
--- a/wpiutil/src/main/native/include/support/raw_socket_istream.h
+++ b/wpiutil/src/main/native/include/support/raw_socket_istream.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/raw_socket_istream.h is deprecated; include wpi/raw_socket_istream.h instead"
 #else
 #warning "support/raw_socket_istream.h is deprecated; include wpi/raw_socket_istream.h instead"
 #endif

+// clang-format on
+
 #include "wpi/raw_socket_istream.h"
--- a/wpiutil/src/main/native/include/support/raw_socket_ostream.h
+++ b/wpiutil/src/main/native/include/support/raw_socket_ostream.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/raw_socket_ostream.h is deprecated; include wpi/raw_socket_ostream.h instead"
 #else
 #warning "support/raw_socket_ostream.h is deprecated; include wpi/raw_socket_ostream.h instead"
 #endif

+// clang-format on
+
 #include "wpi/raw_socket_ostream.h"
--- a/wpiutil/src/main/native/include/support/sha1.h
+++ b/wpiutil/src/main/native/include/support/sha1.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/sha1.h is deprecated; include wpi/sha1.h instead"
 #else
 #warning "support/sha1.h is deprecated; include wpi/sha1.h instead"
 #endif

+// clang-format on
+
 #include "wpi/sha1.h"
--- a/wpiutil/src/main/native/include/support/timestamp.h
+++ b/wpiutil/src/main/native/include/support/timestamp.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/timestamp.h is deprecated; include wpi/timestamp.h instead"
 #else
 #warning "support/timestamp.h is deprecated; include wpi/timestamp.h instead"
 #endif

+// clang-format on
+
 #include "wpi/timestamp.h"