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.
76 lines
3.0 KiB
Diff
76 lines
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Tyler Veness <calcmogul@gmail.com>
|
|
Date: Fri, 8 Sep 2023 19:21:41 -0700
|
|
Subject: [PATCH 1/5] Remove version from namespace
|
|
|
|
---
|
|
include/nlohmann/detail/abi_macros.hpp | 45 ++------------------------
|
|
1 file changed, 3 insertions(+), 42 deletions(-)
|
|
|
|
diff --git a/include/nlohmann/detail/abi_macros.hpp b/include/nlohmann/detail/abi_macros.hpp
|
|
index f48b9eb1d5f0ec15fb47072084a4452f5c39fdde..f333173d73f099b64a60ca7131a0cff7fb6b4521 100644
|
|
--- a/include/nlohmann/detail/abi_macros.hpp
|
|
+++ b/include/nlohmann/detail/abi_macros.hpp
|
|
@@ -42,40 +42,6 @@
|
|
#define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON
|
|
#endif
|
|
|
|
-#ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION
|
|
- #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0
|
|
-#endif
|
|
-
|
|
-// Construct the namespace ABI tags component
|
|
-#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b) json_abi ## a ## b
|
|
-#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b) \
|
|
- NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b)
|
|
-
|
|
-#define NLOHMANN_JSON_ABI_TAGS \
|
|
- NLOHMANN_JSON_ABI_TAGS_CONCAT( \
|
|
- NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS, \
|
|
- NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON)
|
|
-
|
|
-// Construct the namespace version component
|
|
-#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \
|
|
- _v ## major ## _ ## minor ## _ ## patch
|
|
-#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(major, minor, patch) \
|
|
- NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch)
|
|
-
|
|
-#if NLOHMANN_JSON_NAMESPACE_NO_VERSION
|
|
-#define NLOHMANN_JSON_NAMESPACE_VERSION
|
|
-#else
|
|
-#define NLOHMANN_JSON_NAMESPACE_VERSION \
|
|
- NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(NLOHMANN_JSON_VERSION_MAJOR, \
|
|
- NLOHMANN_JSON_VERSION_MINOR, \
|
|
- NLOHMANN_JSON_VERSION_PATCH)
|
|
-#endif
|
|
-
|
|
-// Combine namespace components
|
|
-#define NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) a ## b
|
|
-#define NLOHMANN_JSON_NAMESPACE_CONCAT(a, b) \
|
|
- NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b)
|
|
-
|
|
#ifndef NLOHMANN_JSON_NAMESPACE
|
|
#define NLOHMANN_JSON_NAMESPACE \
|
|
nlohmann::NLOHMANN_JSON_NAMESPACE_CONCAT( \
|
|
@@ -84,17 +50,12 @@
|
|
#endif
|
|
|
|
#ifndef NLOHMANN_JSON_NAMESPACE_BEGIN
|
|
-#define NLOHMANN_JSON_NAMESPACE_BEGIN \
|
|
- namespace nlohmann \
|
|
- { \
|
|
- inline namespace NLOHMANN_JSON_NAMESPACE_CONCAT( \
|
|
- NLOHMANN_JSON_ABI_TAGS, \
|
|
- NLOHMANN_JSON_NAMESPACE_VERSION) \
|
|
+#define NLOHMANN_JSON_NAMESPACE_BEGIN \
|
|
+ namespace nlohmann \
|
|
{
|
|
#endif
|
|
|
|
#ifndef NLOHMANN_JSON_NAMESPACE_END
|
|
-#define NLOHMANN_JSON_NAMESPACE_END \
|
|
- } /* namespace (inline namespace) NOLINT(readability/namespace) */ \
|
|
+#define NLOHMANN_JSON_NAMESPACE_END \
|
|
} // namespace nlohmann
|
|
#endif
|