mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-19 00:41:43 +00:00
6447011bc3
We build docs in three different places, which is annoying to deal with, and it means we build docs two more times than necessary. Now, docs are built just once in the main Gradle workflow, with warnings promoted to errors, eliminating the need for the separate job in lint-format.yml. The uploaded docs artifact is then unpacked and commited to the GitHub Pages repo like normal.
56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Tyler Veness <calcmogul@gmail.com>
|
|
Date: Thu, 7 Sep 2023 22:02:27 -0700
|
|
Subject: [PATCH 2/5] Make serializer public
|
|
|
|
---
|
|
include/nlohmann/detail/output/serializer.hpp | 4 +++-
|
|
include/nlohmann/json.hpp | 3 +--
|
|
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp
|
|
index ed20b0d9e183b940d689d712d9e4b2de0b72017e..8bfe47a248d726e929053aa752a25d2fb4022f9b 100644
|
|
--- a/include/nlohmann/detail/output/serializer.hpp
|
|
+++ b/include/nlohmann/detail/output/serializer.hpp
|
|
@@ -373,7 +373,7 @@ class serializer
|
|
}
|
|
}
|
|
|
|
- JSON_PRIVATE_UNLESS_TESTED:
|
|
+ public:
|
|
/*!
|
|
@brief dump escaped string
|
|
|
|
@@ -696,6 +696,7 @@ class serializer
|
|
return false;
|
|
}
|
|
|
|
+ public:
|
|
/*!
|
|
@brief dump an integer
|
|
|
|
@@ -876,6 +877,7 @@ class serializer
|
|
}
|
|
}
|
|
|
|
+ private:
|
|
/*!
|
|
@brief check whether a string is UTF-8 encoded
|
|
|
|
diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp
|
|
index 95d6bf1dd9d8bae1c87db8fb647c734e9c71f327..8ece57d4a0fde54b24fb6985d9b455b12df835ac 100644
|
|
--- a/include/nlohmann/json.hpp
|
|
+++ b/include/nlohmann/json.hpp
|
|
@@ -157,10 +157,9 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
|
using binary_reader = ::nlohmann::detail::binary_reader<basic_json, InputType>;
|
|
template<typename CharType> using binary_writer = ::nlohmann::detail::binary_writer<basic_json, CharType>;
|
|
|
|
- JSON_PRIVATE_UNLESS_TESTED:
|
|
+ public:
|
|
using serializer = ::nlohmann::detail::serializer<basic_json>;
|
|
|
|
- public:
|
|
using value_t = detail::value_t;
|
|
/// JSON Pointer, see @ref nlohmann::json_pointer
|
|
using json_pointer = ::nlohmann::json_pointer<StringType>;
|