mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-19 00:41:43 +00:00
103 lines
4.5 KiB
Diff
103 lines
4.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Gold856 <117957790+Gold856@users.noreply.github.com>
|
|
Date: Tue, 27 May 2025 23:39:02 -0400
|
|
Subject: [PATCH 5/5] Fix Doxygen warnings
|
|
|
|
---
|
|
include/nlohmann/json.hpp | 33 +++++++--------------------------
|
|
1 file changed, 7 insertions(+), 26 deletions(-)
|
|
|
|
diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp
|
|
index aa869a663906f14e28354d3af18d7528fa5a2bc0..c5829a32868c8d578cd8245d3744f63ed5fcd727 100644
|
|
--- a/include/nlohmann/json.hpp
|
|
+++ b/include/nlohmann/json.hpp
|
|
@@ -162,7 +162,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
|
using serializer = ::nlohmann::detail::serializer<basic_json>;
|
|
|
|
using value_t = detail::value_t;
|
|
- /// JSON Pointer, see @ref nlohmann::json_pointer
|
|
+ /// JSON Pointer, see @ref json_pointer
|
|
using json_pointer = ::nlohmann::json_pointer<StringType>;
|
|
template<typename T, typename SFINAE>
|
|
using json_serializer = JSONSerializer<T, SFINAE>;
|
|
@@ -176,7 +176,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
|
using initializer_list_t = std::initializer_list<detail::json_ref<basic_json>>;
|
|
|
|
using input_format_t = detail::input_format_t;
|
|
- /// SAX interface type, see @ref nlohmann::json_sax
|
|
+ /// SAX interface type, see nlohmann::json_sax
|
|
using json_sax_t = json_sax<basic_json>;
|
|
|
|
////////////////
|
|
@@ -1633,13 +1633,6 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
|
|
|
@throw what @ref json_serializer<ValueType> `from_json()` method throws
|
|
|
|
- @liveexample{The example below shows several conversions from JSON values
|
|
- to other types. There a few things to note: (1) Floating-point numbers can
|
|
- be converted to integers\, (2) A JSON array can be converted to a standard
|
|
- `std::vector<short>`\, (3) A JSON object can be converted to C++
|
|
- associative containers such as `std::unordered_map<std::string\,
|
|
- json>`.,get__ValueType_const}
|
|
-
|
|
@since version 2.1.0
|
|
*/
|
|
template < typename ValueType,
|
|
@@ -1705,7 +1698,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
|
|
|
@return a copy of *this, converted into @a BasicJsonType
|
|
|
|
- @complexity Depending on the implementation of the called `from_json()`
|
|
+ Complexity: Depending on the implementation of the called `from_json()`
|
|
method.
|
|
|
|
@since version 3.2.0
|
|
@@ -1729,7 +1722,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
|
|
|
@return a copy of *this
|
|
|
|
- @complexity Constant.
|
|
+ Complexity: Constant.
|
|
|
|
@since version 2.1.0
|
|
*/
|
|
@@ -1813,12 +1806,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
|
@return pointer to the internally stored JSON value if the requested
|
|
pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
|
|
|
|
- @complexity Constant.
|
|
-
|
|
- @liveexample{The example below shows how pointers to internal values of a
|
|
- JSON value can be requested. Note that no type conversions are made and a
|
|
- `nullptr` is returned if the value and the requested pointer type does not
|
|
- match.,get__PointerType}
|
|
+ Complexity: Constant.
|
|
|
|
@sa see @ref get_ptr() for explicit pointer-member access
|
|
|
|
@@ -1896,7 +1884,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
|
@brief get a value (implicit)
|
|
|
|
Implicit type conversion between the JSON value and a compatible value.
|
|
- The call is realized by calling @ref get() const.
|
|
+ The call is realized by calling @ref get().
|
|
|
|
@tparam ValueType non-pointer type compatible to the JSON value, for
|
|
instance `int` for JSON integer numbers, `bool` for JSON booleans, or
|
|
@@ -1910,14 +1898,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
|
to the JSON value type (e.g., the JSON value is of type boolean, but a
|
|
string is requested); see example below
|
|
|
|
- @complexity Linear in the size of the JSON value.
|
|
-
|
|
- @liveexample{The example below shows several conversions from JSON values
|
|
- to other types. There a few things to note: (1) Floating-point numbers can
|
|
- be converted to integers\, (2) A JSON array can be converted to a standard
|
|
- `std::vector<short>`\, (3) A JSON object can be converted to C++
|
|
- associative containers such as `std::unordered_map<std::string\,
|
|
- json>`.,operator__ValueType}
|
|
+ Complexity: Linear in the size of the JSON value.
|
|
|
|
@since version 1.0.0
|
|
*/
|