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

HAND FIXES: Fix upstream util scripts

Browse Source
This commit is contained in:
PJ Reiniger
2025-11-07 19:57:55 -05:00
committed by Peter Johnson
parent 1e7604f81c
commit 198771dde4
18 changed files with 69 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,14 +10,14 @@ 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..f5f15b241f52cd96a36b885ed10ed7815a0d65ec 100644
index 626f7c0c85e35ec51a90baa3bdd12cd8df7ba957..ecb2165d5e5ecc80b123cd60570f499f7a4e0ed1 100644
--- a/include/nlohmann/detail/output/output_adapters.hpp
+++ b/include/nlohmann/detail/output/output_adapters.hpp
@@ -22,6 +22,8 @@
#include <nlohmann/detail/macro_scope.hpp>
+#include <wpi/raw_ostream.h>
+#include <wpi/util/raw_ostream.hpp>
+
NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail