Merge branch 'develop' into claude/todo-191-plan-508110

Conflicts: none textual. Follow-up fixes for develop's changes:
- docs/mkdocs/docs/api/ordered_map/index.md: develop's new paragraph
  (#5609) was written for api/ordered_map.md; fixed its relative
  ordered_json.md link for the page's new location, plus two
  pre-existing links from an earlier merge (ordered_json.md,
  features/object_order.md)
- tools/api_checker/api_surface.json: regenerated with libclang 18.1.1
  on Linux (swap() noexcept now includes json_base_class_t; new
  integral-key contains/count/find/value overloads)

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann
2026-09-30 20:36:12 +02:00
81 changed files with 4921 additions and 645 deletions
+47 -2
View File
@@ -136,7 +136,7 @@
"name": "swap",
"pretty_signature": "nlohmann::swap",
"scope": "nlohmann",
"signature": "friend void swap(reference left, reference right) noexcept ( std::is_nothrow_move_constructible<value_t>::value&& std::is_nothrow_move_assignable<value_t>::value&& std::is_nothrow_move_constructible<json_value>::value&& std::is_nothrow_move_assignable<json_value>::value )",
"signature": "friend void swap(reference left, reference right) noexcept ( std::is_nothrow_move_constructible<value_t>::value&& std::is_nothrow_move_assignable<value_t>::value&& std::is_nothrow_move_constructible<json_value>::value&& std::is_nothrow_move_assignable<json_value>::value&& std::is_nothrow_move_constructible<json_base_class_t>::value&& std::is_nothrow_move_assignable<json_base_class_t>::value )",
"tier": "callable"
},
{
@@ -607,6 +607,15 @@
"signature": "template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0> JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) bool contains(const typename ::nlohmann::json_pointer<BasicJsonType>& ptr) const",
"tier": "callable"
},
{
"identity_name": "contains",
"kind": "FUNCTION_TEMPLATE",
"name": "contains",
"pretty_signature": "nlohmann::basic_json::contains",
"scope": "nlohmann::basic_json",
"signature": "template<typename T, detail::enable_if_t<std::is_integral<T>::value, int> = 0> bool contains(T) const",
"tier": "callable"
},
{
"identity_name": "count",
"kind": "CXX_METHOD",
@@ -625,6 +634,15 @@
"signature": "template<class KeyType, detail::enable_if_t< detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0> JSON_HEDLEY_WARN_UNUSED_RESULT size_type count(KeyType && key) const",
"tier": "callable"
},
{
"identity_name": "count",
"kind": "FUNCTION_TEMPLATE",
"name": "count",
"pretty_signature": "nlohmann::basic_json::count",
"scope": "nlohmann::basic_json",
"signature": "template<typename T, detail::enable_if_t<std::is_integral<T>::value, int> = 0> size_type count(T) const",
"tier": "callable"
},
{
"identity_name": "crbegin",
"kind": "CXX_METHOD",
@@ -823,6 +841,24 @@
"signature": "template<class KeyType, detail::enable_if_t< detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0> iterator find(KeyType && key)",
"tier": "callable"
},
{
"identity_name": "find",
"kind": "FUNCTION_TEMPLATE",
"name": "find",
"pretty_signature": "nlohmann::basic_json::find",
"scope": "nlohmann::basic_json",
"signature": "template<typename T, detail::enable_if_t<std::is_integral<T>::value, int> = 0> const_iterator find(T) const",
"tier": "callable"
},
{
"identity_name": "find",
"kind": "FUNCTION_TEMPLATE",
"name": "find",
"pretty_signature": "nlohmann::basic_json::find",
"scope": "nlohmann::basic_json",
"signature": "template<typename T, detail::enable_if_t<std::is_integral<T>::value, int> = 0> iterator find(T)",
"tier": "callable"
},
{
"identity_name": "flatten",
"kind": "CXX_METHOD",
@@ -1936,7 +1972,7 @@
"name": "swap",
"pretty_signature": "nlohmann::basic_json::swap",
"scope": "nlohmann::basic_json",
"signature": "void swap(reference other) noexcept ( std::is_nothrow_move_constructible<value_t>::value&& std::is_nothrow_move_assignable<value_t>::value&& std::is_nothrow_move_constructible<json_value>::value&& std::is_nothrow_move_assignable<json_value>::value )",
"signature": "void swap(reference other) noexcept ( std::is_nothrow_move_constructible<value_t>::value&& std::is_nothrow_move_assignable<value_t>::value&& std::is_nothrow_move_constructible<json_value>::value&& std::is_nothrow_move_assignable<json_value>::value&& std::is_nothrow_move_constructible<json_base_class_t>::value&& std::is_nothrow_move_assignable<json_base_class_t>::value )",
"tier": "callable"
},
{
@@ -2245,6 +2281,15 @@
"signature": "template < class ValueType, detail::enable_if_t < detail::is_getable<basic_json_t, ValueType>::value && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 > ValueType value(const json_pointer& ptr, const ValueType& default_value) const",
"tier": "callable"
},
{
"identity_name": "value",
"kind": "FUNCTION_TEMPLATE",
"name": "value",
"pretty_signature": "nlohmann::basic_json::value",
"scope": "nlohmann::basic_json",
"signature": "template<typename T, typename ValueType, detail::enable_if_t<std::is_integral<T>::value, int> = 0> ValueType value(T, ValueType&&) const",
"tier": "callable"
},
{
"identity_name": "value_t",
"kind": "TYPE_ALIAS_DECL",