Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCRIPT run upstream utils

Browse Source
This commit is contained in:
PJ Reiniger
2025-11-07 19:58:22 -05:00
committed by Peter Johnson
parent 198771dde4
commit bf9da2cdea
55 changed files with 169 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
upstream_utils/json_patches/0004-Add-llvm-stream-support.patch
View File

@@ -10,7 +10,7 @@ Subject: [PATCH 4/5] Add llvm stream support
3 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/include/nlohmann/detail/output/output_adapters.hpp b/include/nlohmann/detail/output/output_adapters.hpp
index 626f7c0c85e35ec51a90baa3bdd12cd8df7ba957..ecb2165d5e5ecc80b123cd60570f499f7a4e0ed1 100644
index 626f7c0c85e35ec51a90baa3bdd12cd8df7ba957..2e2e92f9718ec13aaa585955707419f27b2088c6 100644
--- a/include/nlohmann/detail/output/output_adapters.hpp
+++ b/include/nlohmann/detail/output/output_adapters.hpp
@@ -22,6 +22,8 @@

2
upstream_utils/llvm_patches/0015-Fixup-includes.patch
View File

@@ -67,7 +67,7 @@ index 4de36d969b3776b72ff85888355b64f7f3262ccc..e813fd3faa9f76148f9802c4b7308e51
#include <ntstatus.h>
#include <winerror.h>
diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
index a74b6b00d616828a8e5ab25c1fd15f2528b4d76d..a59603f9f2518428ae331e339dca2562de1ac4ff 100644
index a74b6b00d616828a8e5ab25c1fd15f2528b4d76d..d8f0c5c7f0f4d5e468b30d53dc6eb8d777a0da9f 100644
--- a/llvm/lib/Support/raw_ostream.cpp
+++ b/llvm/lib/Support/raw_ostream.cpp
@@ -15,6 +15,8 @@

4
upstream_utils/llvm_patches/0017-Windows-support.patch
View File

@@ -91,7 +91,7 @@ index 83d5586ae8a77ec585e7e59df3075ca59cfb9d0c..395965bc6fc969ed9a2d92743a0010dd
} // end namespace llvm.
diff --git a/llvm/lib/Support/ConvertUTF.cpp b/llvm/lib/Support/ConvertUTF.cpp
index bc04c5ab5113563fb82d7b3b168985369b611f4b..14fb61ff3465f08a931981f560ea5b176ca888b8 100644
index bc04c5ab5113563fb82d7b3b168985369b611f4b..15e9a4e5b4cba5802c053e22e0536b0820615dd2 100644
--- a/llvm/lib/Support/ConvertUTF.cpp
+++ b/llvm/lib/Support/ConvertUTF.cpp
@@ -67,6 +67,11 @@
@@ -204,7 +204,7 @@ index bc04c5ab5113563fb82d7b3b168985369b611f4b..14fb61ff3465f08a931981f560ea5b17
ConvertUTF_RESTORE_WARNINGS
diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
index a59603f9f2518428ae331e339dca2562de1ac4ff..585f45d9eedc2d900886988010738dc390acbf90 100644
index d8f0c5c7f0f4d5e468b30d53dc6eb8d777a0da9f..a1b40ae78da9fed4bb9d489f298c7adc9cf437b9 100644
--- a/llvm/lib/Support/raw_ostream.cpp
+++ b/llvm/lib/Support/raw_ostream.cpp
@@ -524,7 +524,6 @@ void raw_fd_ostream::write_impl(const char *Ptr, size_t Size) {

2
upstream_utils/llvm_patches/0021-Remove-unused-functions.patch
View File

@@ -75,7 +75,7 @@ index 2f160c45b47cf57bb28f6393dd56cde06089639b..9ef6f7da66c66a35b1ce63e603e8590c
#define WIN32_NO_STATUS
diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
index 585f45d9eedc2d900886988010738dc390acbf90..841a30962da17fc3d7bd18e14b44993900b3f984 100644
index a1b40ae78da9fed4bb9d489f298c7adc9cf437b9..3333890ed1b086c94cdfce8bc9efb3d191a47f89 100644
--- a/llvm/lib/Support/raw_ostream.cpp
+++ b/llvm/lib/Support/raw_ostream.cpp
@@ -168,16 +168,6 @@ raw_ostream &raw_ostream::write_escaped(std::string_view Str,

2
upstream_utils/llvm_patches/0024-Prefer-to-use-static-pointers-in-raw_ostream.patch
View File

@@ -9,7 +9,7 @@ See #1401
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
index 841a30962da17fc3d7bd18e14b44993900b3f984..7a838a544a3ee5919cc48f806bceeaa3c1cec0de 100644
index 3333890ed1b086c94cdfce8bc9efb3d191a47f89..7561f818287d208c628a126c3f8a6f7d531df236 100644
--- a/llvm/lib/Support/raw_ostream.cpp
+++ b/llvm/lib/Support/raw_ostream.cpp
@@ -608,9 +608,9 @@ raw_fd_ostream &llvm::outs() {

2
upstream_utils/llvm_patches/0031-raw_ostream-Replace-errnoAsErrorCode.patch
View File

@@ -8,7 +8,7 @@ Subject: [PATCH 31/36] raw_ostream: Replace errnoAsErrorCode()
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
index 7a838a544a3ee5919cc48f806bceeaa3c1cec0de..4b76e51dd3c3dcb050a8dc2e5d88f4575acd51b5 100644
index 7561f818287d208c628a126c3f8a6f7d531df236..816242fa1139d66467435a4b1acbfa93f799c00f 100644
--- a/llvm/lib/Support/raw_ostream.cpp
+++ b/llvm/lib/Support/raw_ostream.cpp
@@ -523,7 +523,7 @@ void raw_fd_ostream::write_impl(const char *Ptr, size_t Size) {

4
upstream_utils/llvm_patches/0033-Remove-auto-conversion-from-raw_ostream.patch
View File

@@ -8,11 +8,11 @@ Subject: [PATCH 33/36] Remove auto-conversion from raw_ostream
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
index 4b76e51dd3c3dcb050a8dc2e5d88f4575acd51b5..e8536a0d98c78ab2bbf400418b37f5dd4b8a8c42 100644
index 816242fa1139d66467435a4b1acbfa93f799c00f..40da41028c75f4906b76e85b36ca546494d5bd12 100644
--- a/llvm/lib/Support/raw_ostream.cpp
+++ b/llvm/lib/Support/raw_ostream.cpp
@@ -19,7 +19,6 @@
#include "wpi/util/SmallVector.h"
#include "wpi/util/SmallVector.hpp"
#include "llvm/ADT/StringExtras.h"
#include "llvm/Config/config.h"
-#include "llvm/Support/AutoConvert.h"

2
upstream_utils/sleipnir_patches/0003-Use-wpi-byteswap.patch
View File

@@ -19,7 +19,7 @@ index 4f4c76204071f90bf49eddb8c2aceb583b5e09ba..03938557c2600a7a1f72c6b93c935602
+ ^wpi/
}
diff --git a/include/sleipnir/util/spy.hpp b/include/sleipnir/util/spy.hpp
index a2f94803e3744cee771669210d1af883160e9896..74dd7990b03783ce805a186920d5142caeb178c6 100644
index a2f94803e3744cee771669210d1af883160e9896..43dcc748b679eac89986b154b26a1c0282345d82 100644
--- a/include/sleipnir/util/spy.hpp
+++ b/include/sleipnir/util/spy.hpp
@@ -12,6 +12,7 @@

2
wpimath/src/main/native/thirdparty/sleipnir/include/gch/small_vector.hpp vendored
View File

@@ -2,7 +2,7 @@
#pragma once
#include "wpi/util/SmallVector.hpp"
#include <wpi/util/SmallVector.hpp>
namespace gch {

2
wpimath/src/main/native/thirdparty/sleipnir/include/sleipnir/util/spy.hpp vendored
View File

@@ -12,7 +12,7 @@
#include <string_view>
#include <Eigen/SparseCore>
#include "wpi/util/bit.hpp"
#include <wpi/util/bit.hpp>
#include "sleipnir/util/symbol_exports.hpp"

8
wpiutil/src/main/native/thirdparty/json/include/wpi/util/adl_serializer.hpp vendored
View File

@@ -10,10 +10,10 @@
#include <utility>
#include "wpi/util/detail/abi_macros.hpp"
#include "wpi/util/detail/conversions/from_json.hpp"
#include "wpi/util/detail/conversions/to_json.hpp"
#include "wpi/util/detail/meta/identity_tag.hpp"
#include <wpi/util/detail/abi_macros.hpp>
#include <wpi/util/detail/conversions/from_json.hpp>
#include <wpi/util/detail/conversions/to_json.hpp>
#include <wpi/util/detail/meta/identity_tag.hpp>
WPI_JSON_NAMESPACE_BEGIN

2
wpiutil/src/main/native/thirdparty/json/include/wpi/util/byte_container_with_subtype.hpp vendored
View File

@@ -12,7 +12,7 @@
#include <tuple> // tie
#include <utility> // move
#include "wpi/util/detail/abi_macros.hpp"
#include <wpi/util/detail/abi_macros.hpp>
WPI_JSON_NAMESPACE_BEGIN

16
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/from_json.hpp vendored
View File

@@ -20,14 +20,14 @@
#include <utility> // pair, declval
#include <valarray> // valarray
#include "wpi/util/detail/exceptions.hpp"
#include "wpi/util/detail/macro_scope.hpp"
#include "wpi/util/detail/meta/cpp_future.hpp"
#include "wpi/util/detail/meta/identity_tag.hpp"
#include "wpi/util/detail/meta/std_fs.hpp"
#include "wpi/util/detail/meta/type_traits.hpp"
#include "wpi/util/detail/string_concat.hpp"
#include "wpi/util/detail/value_t.hpp"
#include <wpi/util/detail/exceptions.hpp>
#include <wpi/util/detail/macro_scope.hpp>
#include <wpi/util/detail/meta/cpp_future.hpp>
#include <wpi/util/detail/meta/identity_tag.hpp>
#include <wpi/util/detail/meta/std_fs.hpp>
#include <wpi/util/detail/meta/type_traits.hpp>
#include <wpi/util/detail/string_concat.hpp>
#include <wpi/util/detail/value_t.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

2
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/to_chars.hpp vendored
View File

@@ -16,7 +16,7 @@
#include <limits> // numeric_limits
#include <type_traits> // conditional
#include "wpi/util/detail/macro_scope.hpp"
#include <wpi/util/detail/macro_scope.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

12
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/to_json.hpp vendored
View File

@@ -17,12 +17,12 @@
#include <valarray> // valarray
#include <vector> // vector
#include "wpi/util/detail/iterators/iteration_proxy.hpp"
#include "wpi/util/detail/macro_scope.hpp"
#include "wpi/util/detail/meta/cpp_future.hpp"
#include "wpi/util/detail/meta/std_fs.hpp"
#include "wpi/util/detail/meta/type_traits.hpp"
#include "wpi/util/detail/value_t.hpp"
#include <wpi/util/detail/iterators/iteration_proxy.hpp>
#include <wpi/util/detail/macro_scope.hpp>
#include <wpi/util/detail/meta/cpp_future.hpp>
#include <wpi/util/detail/meta/std_fs.hpp>
#include <wpi/util/detail/meta/type_traits.hpp>
#include <wpi/util/detail/value_t.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

14
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/exceptions.hpp vendored
View File

@@ -17,13 +17,13 @@
#include <string> // to_string
#include <vector> // vector
#include "wpi/util/detail/value_t.hpp"
#include "wpi/util/detail/string_escape.hpp"
#include "wpi/util/detail/input/position_t.hpp"
#include "wpi/util/detail/macro_scope.hpp"
#include "wpi/util/detail/meta/cpp_future.hpp"
#include "wpi/util/detail/meta/type_traits.hpp"
#include "wpi/util/detail/string_concat.hpp"
#include <wpi/util/detail/value_t.hpp>
#include <wpi/util/detail/string_escape.hpp>
#include <wpi/util/detail/input/position_t.hpp>
#include <wpi/util/detail/macro_scope.hpp>
#include <wpi/util/detail/meta/cpp_future.hpp>
#include <wpi/util/detail/meta/type_traits.hpp>
#include <wpi/util/detail/string_concat.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

4
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/hash.hpp vendored
View File

@@ -12,8 +12,8 @@
#include <cstddef> // size_t
#include <functional> // hash
#include "wpi/util/detail/abi_macros.hpp"
#include "wpi/util/detail/value_t.hpp"
#include <wpi/util/detail/abi_macros.hpp>
#include <wpi/util/detail/value_t.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

18
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/binary_reader.hpp vendored
View File

@@ -21,15 +21,15 @@
#include <utility> // make_pair, move
#include <vector> // vector
#include "wpi/util/detail/exceptions.hpp"
#include "wpi/util/detail/input/input_adapters.hpp"
#include "wpi/util/detail/input/json_sax.hpp"
#include "wpi/util/detail/input/lexer.hpp"
#include "wpi/util/detail/macro_scope.hpp"
#include "wpi/util/detail/meta/is_sax.hpp"
#include "wpi/util/detail/meta/type_traits.hpp"
#include "wpi/util/detail/string_concat.hpp"
#include "wpi/util/detail/value_t.hpp"
#include <wpi/util/detail/exceptions.hpp>
#include <wpi/util/detail/input/input_adapters.hpp>
#include <wpi/util/detail/input/json_sax.hpp>
#include <wpi/util/detail/input/lexer.hpp>
#include <wpi/util/detail/macro_scope.hpp>
#include <wpi/util/detail/meta/is_sax.hpp>
#include <wpi/util/detail/meta/type_traits.hpp>
#include <wpi/util/detail/string_concat.hpp>
#include <wpi/util/detail/value_t.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

6
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/input_adapters.hpp vendored
View File

@@ -23,9 +23,9 @@
#include <istream> // istream
#endif // JSON_NO_IO
#include "wpi/util/detail/iterators/iterator_traits.hpp"
#include "wpi/util/detail/macro_scope.hpp"
#include "wpi/util/detail/meta/type_traits.hpp"
#include <wpi/util/detail/iterators/iterator_traits.hpp>
#include <wpi/util/detail/macro_scope.hpp>
#include <wpi/util/detail/meta/type_traits.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

6
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/json_sax.hpp vendored
View File

@@ -13,9 +13,9 @@
#include <utility> // move
#include <vector> // vector
#include "wpi/util/detail/exceptions.hpp"
#include "wpi/util/detail/macro_scope.hpp"
#include "wpi/util/detail/string_concat.hpp"
#include <wpi/util/detail/exceptions.hpp>
#include <wpi/util/detail/macro_scope.hpp>
#include <wpi/util/detail/string_concat.hpp>
WPI_JSON_NAMESPACE_BEGIN

8
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/lexer.hpp vendored
View File

@@ -18,10 +18,10 @@
#include <utility> // move
#include <vector> // vector
#include "wpi/util/detail/input/input_adapters.hpp"
#include "wpi/util/detail/input/position_t.hpp"
#include "wpi/util/detail/macro_scope.hpp"
#include "wpi/util/detail/meta/type_traits.hpp"
#include <wpi/util/detail/input/input_adapters.hpp>
#include <wpi/util/detail/input/position_t.hpp>
#include <wpi/util/detail/macro_scope.hpp>
#include <wpi/util/detail/meta/type_traits.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

16
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/parser.hpp vendored
View File

@@ -15,14 +15,14 @@
#include <utility> // move
#include <vector> // vector
#include "wpi/util/detail/exceptions.hpp"
#include "wpi/util/detail/input/input_adapters.hpp"
#include "wpi/util/detail/input/json_sax.hpp"
#include "wpi/util/detail/input/lexer.hpp"
#include "wpi/util/detail/macro_scope.hpp"
#include "wpi/util/detail/meta/is_sax.hpp"
#include "wpi/util/detail/string_concat.hpp"
#include "wpi/util/detail/value_t.hpp"
#include <wpi/util/detail/exceptions.hpp>
#include <wpi/util/detail/input/input_adapters.hpp>
#include <wpi/util/detail/input/json_sax.hpp>
#include <wpi/util/detail/input/lexer.hpp>
#include <wpi/util/detail/macro_scope.hpp>
#include <wpi/util/detail/meta/is_sax.hpp>
#include <wpi/util/detail/string_concat.hpp>
#include <wpi/util/detail/value_t.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

2
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/position_t.hpp vendored
View File

@@ -10,7 +10,7 @@
#include <cstddef> // size_t
#include "wpi/util/detail/abi_macros.hpp"
#include <wpi/util/detail/abi_macros.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

4
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/internal_iterator.hpp vendored
View File

@@ -8,8 +8,8 @@
#pragma once
#include "wpi/util/detail/abi_macros.hpp"
#include "wpi/util/detail/iterators/primitive_iterator.hpp"
#include <wpi/util/detail/abi_macros.hpp>
#include <wpi/util/detail/iterators/primitive_iterator.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

14
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iter_impl.hpp vendored
View File

@@ -11,13 +11,13 @@
#include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
#include <type_traits> // conditional, is_const, remove_const
#include "wpi/util/detail/exceptions.hpp"
#include "wpi/util/detail/iterators/internal_iterator.hpp"
#include "wpi/util/detail/iterators/primitive_iterator.hpp"
#include "wpi/util/detail/macro_scope.hpp"
#include "wpi/util/detail/meta/cpp_future.hpp"
#include "wpi/util/detail/meta/type_traits.hpp"
#include "wpi/util/detail/value_t.hpp"
#include <wpi/util/detail/exceptions.hpp>
#include <wpi/util/detail/iterators/internal_iterator.hpp>
#include <wpi/util/detail/iterators/primitive_iterator.hpp>
#include <wpi/util/detail/macro_scope.hpp>
#include <wpi/util/detail/meta/cpp_future.hpp>
#include <wpi/util/detail/meta/type_traits.hpp>
#include <wpi/util/detail/value_t.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

6
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iteration_proxy.hpp vendored
View File

@@ -18,9 +18,9 @@
#include <ranges> // enable_borrowed_range
#endif
#include "wpi/util/detail/abi_macros.hpp"
#include "wpi/util/detail/meta/type_traits.hpp"
#include "wpi/util/detail/value_t.hpp"
#include <wpi/util/detail/abi_macros.hpp>
#include <wpi/util/detail/meta/type_traits.hpp>
#include <wpi/util/detail/value_t.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

6
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iterator_traits.hpp vendored
View File

@@ -10,9 +10,9 @@
#include <iterator> // random_access_iterator_tag
#include "wpi/util/detail/abi_macros.hpp"
#include "wpi/util/detail/meta/void_t.hpp"
#include "wpi/util/detail/meta/cpp_future.hpp"
#include <wpi/util/detail/abi_macros.hpp>
#include <wpi/util/detail/meta/void_t.hpp>
#include <wpi/util/detail/meta/cpp_future.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

2
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/json_reverse_iterator.hpp vendored
View File

@@ -12,7 +12,7 @@
#include <iterator> // reverse_iterator
#include <utility> // declval
#include "wpi/util/detail/abi_macros.hpp"
#include <wpi/util/detail/abi_macros.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

2
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/primitive_iterator.hpp vendored
View File

@@ -11,7 +11,7 @@
#include <cstddef> // ptrdiff_t
#include <limits> // numeric_limits
#include "wpi/util/detail/macro_scope.hpp"
#include <wpi/util/detail/macro_scope.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

2
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_custom_base_class.hpp vendored
View File

@@ -10,7 +10,7 @@
#include <type_traits> // conditional, is_same
#include "wpi/util/detail/abi_macros.hpp"
#include <wpi/util/detail/abi_macros.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

10
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_pointer.hpp vendored
View File

@@ -21,11 +21,11 @@
#include <utility> // move
#include <vector> // vector
#include "wpi/util/detail/exceptions.hpp"
#include "wpi/util/detail/macro_scope.hpp"
#include "wpi/util/detail/string_concat.hpp"
#include "wpi/util/detail/string_escape.hpp"
#include "wpi/util/detail/value_t.hpp"
#include <wpi/util/detail/exceptions.hpp>
#include <wpi/util/detail/macro_scope.hpp>
#include <wpi/util/detail/string_concat.hpp>
#include <wpi/util/detail/string_escape.hpp>
#include <wpi/util/detail/value_t.hpp>
WPI_JSON_NAMESPACE_BEGIN

4
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_ref.hpp vendored
View File

@@ -11,8 +11,8 @@
#include <initializer_list>
#include <utility>
#include "wpi/util/detail/abi_macros.hpp"
#include "wpi/util/detail/meta/type_traits.hpp"
#include <wpi/util/detail/abi_macros.hpp>
#include <wpi/util/detail/meta/type_traits.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

6
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/macro_scope.hpp vendored
View File

@@ -9,13 +9,13 @@
#pragma once
#include <utility> // declval, pair
#include "wpi/util/detail/meta/detected.hpp"
#include "wpi/util/thirdparty/hedley/hedley.hpp"
#include <wpi/util/detail/meta/detected.hpp>
#include <wpi/util/thirdparty/hedley/hedley.hpp>
// This file contains all internal macro definitions (except those affecting ABI)
// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
#include "wpi/util/detail/abi_macros.hpp"
#include <wpi/util/detail/abi_macros.hpp>
// exclude unsupported compilers
#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)

2
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/macro_unscope.hpp vendored
View File

@@ -42,4 +42,4 @@
#undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
#endif
#include "wpi/util/thirdparty/hedley/hedley_undef.hpp"
#include <wpi/util/thirdparty/hedley/hedley_undef.hpp>

2
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/call_std/begin.hpp vendored
View File

@@ -8,7 +8,7 @@
#pragma once
#include "wpi/util/detail/macro_scope.hpp"
#include <wpi/util/detail/macro_scope.hpp>
WPI_JSON_NAMESPACE_BEGIN

2
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/call_std/end.hpp vendored
View File

@@ -8,7 +8,7 @@
#pragma once
#include "wpi/util/detail/macro_scope.hpp"
#include <wpi/util/detail/macro_scope.hpp>
WPI_JSON_NAMESPACE_BEGIN

2
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/cpp_future.hpp vendored
View File

@@ -14,7 +14,7 @@
#include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
#include <utility> // index_sequence, make_index_sequence, index_sequence_for
#include "wpi/util/detail/macro_scope.hpp"
#include <wpi/util/detail/macro_scope.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

2
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/detected.hpp vendored
View File

@@ -10,7 +10,7 @@
#include <type_traits>
#include "wpi/util/detail/meta/void_t.hpp"
#include <wpi/util/detail/meta/void_t.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

2
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/identity_tag.hpp vendored
View File

@@ -8,7 +8,7 @@
#pragma once
#include "wpi/util/detail/abi_macros.hpp"
#include <wpi/util/detail/abi_macros.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

6
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/is_sax.hpp vendored
View File

@@ -12,9 +12,9 @@
#include <utility> // declval
#include <string> // string
#include "wpi/util/detail/abi_macros.hpp"
#include "wpi/util/detail/meta/detected.hpp"
#include "wpi/util/detail/meta/type_traits.hpp"
#include <wpi/util/detail/abi_macros.hpp>
#include <wpi/util/detail/meta/detected.hpp>
#include <wpi/util/detail/meta/type_traits.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

2
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/std_fs.hpp vendored
View File

@@ -8,7 +8,7 @@
#pragma once
#include "wpi/util/detail/macro_scope.hpp"
#include <wpi/util/detail/macro_scope.hpp>
#if JSON_HAS_EXPERIMENTAL_FILESYSTEM
#include <experimental/filesystem>

14
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/type_traits.hpp vendored
View File

@@ -14,13 +14,13 @@
#include <tuple> // tuple
#include <string> // char_traits
#include "wpi/util/detail/iterators/iterator_traits.hpp"
#include "wpi/util/detail/macro_scope.hpp"
#include "wpi/util/detail/meta/call_std/begin.hpp"
#include "wpi/util/detail/meta/call_std/end.hpp"
#include "wpi/util/detail/meta/cpp_future.hpp"
#include "wpi/util/detail/meta/detected.hpp"
#include "wpi/util/json_fwd.hpp"
#include <wpi/util/detail/iterators/iterator_traits.hpp>
#include <wpi/util/detail/macro_scope.hpp>
#include <wpi/util/detail/meta/call_std/begin.hpp>
#include <wpi/util/detail/meta/call_std/end.hpp>
#include <wpi/util/detail/meta/cpp_future.hpp>
#include <wpi/util/detail/meta/detected.hpp>
#include <wpi/util/json_fwd.hpp>
WPI_JSON_NAMESPACE_BEGIN
/*!

2
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/void_t.hpp vendored
View File

@@ -8,7 +8,7 @@
#pragma once
#include "wpi/util/detail/abi_macros.hpp"
#include <wpi/util/detail/abi_macros.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

8
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/binary_writer.hpp vendored
View File

@@ -19,10 +19,10 @@
#include <utility> // move
#include <vector> // vector
#include "wpi/util/detail/input/binary_reader.hpp"
#include "wpi/util/detail/macro_scope.hpp"
#include "wpi/util/detail/output/output_adapters.hpp"
#include "wpi/util/detail/string_concat.hpp"
#include <wpi/util/detail/input/binary_reader.hpp>
#include <wpi/util/detail/macro_scope.hpp>
#include <wpi/util/detail/output/output_adapters.hpp>
#include <wpi/util/detail/string_concat.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

4
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/output_adapters.hpp vendored
View File

@@ -20,9 +20,9 @@
#include <ostream> // basic_ostream
#endif // JSON_NO_IO
#include "wpi/util/detail/macro_scope.hpp"
#include <wpi/util/detail/macro_scope.hpp>
#include "wpi/util/raw_ostream.hpp"
#include <wpi/util/raw_ostream.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

16
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/serializer.hpp vendored
View File

@@ -22,14 +22,14 @@
#include <type_traits> // is_same
#include <utility> // move
#include "wpi/util/detail/conversions/to_chars.hpp"
#include "wpi/util/detail/exceptions.hpp"
#include "wpi/util/detail/macro_scope.hpp"
#include "wpi/util/detail/meta/cpp_future.hpp"
#include "wpi/util/detail/output/binary_writer.hpp"
#include "wpi/util/detail/output/output_adapters.hpp"
#include "wpi/util/detail/string_concat.hpp"
#include "wpi/util/detail/value_t.hpp"
#include <wpi/util/detail/conversions/to_chars.hpp>
#include <wpi/util/detail/exceptions.hpp>
#include <wpi/util/detail/macro_scope.hpp>
#include <wpi/util/detail/meta/cpp_future.hpp>
#include <wpi/util/detail/output/binary_writer.hpp>
#include <wpi/util/detail/output/output_adapters.hpp>
#include <wpi/util/detail/string_concat.hpp>
#include <wpi/util/detail/value_t.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

4
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/string_concat.hpp vendored
View File

@@ -12,8 +12,8 @@
#include <string> // string
#include <utility> // forward
#include "wpi/util/detail/meta/cpp_future.hpp"
#include "wpi/util/detail/meta/detected.hpp"
#include <wpi/util/detail/meta/cpp_future.hpp>
#include <wpi/util/detail/meta/detected.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

2
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/string_escape.hpp vendored
View File

@@ -8,7 +8,7 @@
#pragma once
#include "wpi/util/detail/abi_macros.hpp"
#include <wpi/util/detail/abi_macros.hpp>
WPI_JSON_NAMESPACE_BEGIN
namespace detail

2
wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/value_t.hpp vendored
View File

@@ -13,7 +13,7 @@
#include <cstdint> // uint8_t
#include <string> // string
#include "wpi/util/detail/macro_scope.hpp"
#include <wpi/util/detail/macro_scope.hpp>
#if JSON_HAS_THREE_WAY_COMPARISON
#include <compare> // partial_ordering
#endif

60
wpiutil/src/main/native/thirdparty/json/include/wpi/util/json.hpp vendored
View File

@@ -31,35 +31,35 @@
#include <utility> // declval, forward, move, pair, swap
#include <vector> // vector
#include "wpi/util/adl_serializer.hpp"
#include "wpi/util/byte_container_with_subtype.hpp"
#include "wpi/util/detail/conversions/from_json.hpp"
#include "wpi/util/detail/conversions/to_json.hpp"
#include "wpi/util/detail/exceptions.hpp"
#include "wpi/util/detail/hash.hpp"
#include "wpi/util/detail/input/binary_reader.hpp"
#include "wpi/util/detail/input/input_adapters.hpp"
#include "wpi/util/detail/input/lexer.hpp"
#include "wpi/util/detail/input/parser.hpp"
#include "wpi/util/detail/iterators/internal_iterator.hpp"
#include "wpi/util/detail/iterators/iter_impl.hpp"
#include "wpi/util/detail/iterators/iteration_proxy.hpp"
#include "wpi/util/detail/iterators/json_reverse_iterator.hpp"
#include "wpi/util/detail/iterators/primitive_iterator.hpp"
#include "wpi/util/detail/json_custom_base_class.hpp"
#include "wpi/util/detail/json_pointer.hpp"
#include "wpi/util/detail/json_ref.hpp"
#include "wpi/util/detail/macro_scope.hpp"
#include "wpi/util/detail/string_concat.hpp"
#include "wpi/util/detail/string_escape.hpp"
#include "wpi/util/detail/meta/cpp_future.hpp"
#include "wpi/util/detail/meta/type_traits.hpp"
#include "wpi/util/detail/output/binary_writer.hpp"
#include "wpi/util/detail/output/output_adapters.hpp"
#include "wpi/util/detail/output/serializer.hpp"
#include "wpi/util/detail/value_t.hpp"
#include "wpi/util/json_fwd.hpp"
#include "wpi/util/ordered_map.hpp"
#include <wpi/util/adl_serializer.hpp>
#include <wpi/util/byte_container_with_subtype.hpp>
#include <wpi/util/detail/conversions/from_json.hpp>
#include <wpi/util/detail/conversions/to_json.hpp>
#include <wpi/util/detail/exceptions.hpp>
#include <wpi/util/detail/hash.hpp>
#include <wpi/util/detail/input/binary_reader.hpp>
#include <wpi/util/detail/input/input_adapters.hpp>
#include <wpi/util/detail/input/lexer.hpp>
#include <wpi/util/detail/input/parser.hpp>
#include <wpi/util/detail/iterators/internal_iterator.hpp>
#include <wpi/util/detail/iterators/iter_impl.hpp>
#include <wpi/util/detail/iterators/iteration_proxy.hpp>
#include <wpi/util/detail/iterators/json_reverse_iterator.hpp>
#include <wpi/util/detail/iterators/primitive_iterator.hpp>
#include <wpi/util/detail/json_custom_base_class.hpp>
#include <wpi/util/detail/json_pointer.hpp>
#include <wpi/util/detail/json_ref.hpp>
#include <wpi/util/detail/macro_scope.hpp>
#include <wpi/util/detail/string_concat.hpp>
#include <wpi/util/detail/string_escape.hpp>
#include <wpi/util/detail/meta/cpp_future.hpp>
#include <wpi/util/detail/meta/type_traits.hpp>
#include <wpi/util/detail/output/binary_writer.hpp>
#include <wpi/util/detail/output/output_adapters.hpp>
#include <wpi/util/detail/output/serializer.hpp>
#include <wpi/util/detail/value_t.hpp>
#include <wpi/util/json_fwd.hpp>
#include <wpi/util/ordered_map.hpp>
#if defined(JSON_HAS_CPP_17)
#if JSON_HAS_STATIC_RTTI
@@ -5257,6 +5257,6 @@ inline void swap(wpi::WPI_BASIC_JSON_TPL& j1, wpi::WPI_BASIC_JSON_TPL& j2) noexc
#endif
#endif
#include "wpi/util/detail/macro_unscope.hpp"
#include <wpi/util/detail/macro_unscope.hpp>
#endif // INCLUDE_WPI_JSON_HPP_

2
wpiutil/src/main/native/thirdparty/json/include/wpi/util/json_fwd.hpp vendored
View File

@@ -15,7 +15,7 @@
#include <string> // string
#include <vector> // vector
#include "wpi/util/detail/abi_macros.hpp"
#include <wpi/util/detail/abi_macros.hpp>
/*!
@brief namespace for Niels Lohmann

4
wpiutil/src/main/native/thirdparty/json/include/wpi/util/ordered_map.hpp vendored
View File

@@ -17,8 +17,8 @@
#include <utility> // pair
#include <vector> // vector
#include "wpi/util/detail/macro_scope.hpp"
#include "wpi/util/detail/meta/type_traits.hpp"
#include <wpi/util/detail/macro_scope.hpp>
#include <wpi/util/detail/meta/type_traits.hpp>
WPI_JSON_NAMESPACE_BEGIN

2
wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/ConvertUTF.cpp vendored
View File

@@ -69,7 +69,7 @@
#ifdef _WIN32
#include "wpi/util/WindowsError.hpp"
#include "Windows/WindowsSupport.h"
#include "Windows/WindowsSupport.hpp"
#endif
/*

2
wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/ErrorHandling.cpp vendored
View File

@@ -176,7 +176,7 @@ void wpi::wpi_unreachable_internal(const char *msg, const char *file,
#ifdef _WIN32
#define WIN32_NO_STATUS
#include "Windows/WindowsSupport.h"
#include "Windows/WindowsSupport.hpp"
#undef WIN32_NO_STATUS
#include <ntstatus.h>
#include <winerror.h>

2
wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/raw_ostream.cpp vendored
View File

@@ -54,7 +54,7 @@
#ifdef _WIN32
#include "wpi/util/ConvertUTF.hpp"
#include "Windows/WindowsSupport.h"
#include "Windows/WindowsSupport.hpp"
#endif
using namespace wpi;