amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-31 09:55:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into claude/json-view-canada-perf-99bbe3

Browse Source 
Picks up the fix for the duplicate is_editable in basic_json_view (#5966), which broke every build of the json_view tests on develop.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann committed 2026-10-30 16:54:14 +01:00
2 parents 12d2ad6da5 755bb16d7a
commit b6ed821580
2 files changed
-6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/nlohmann/json_view.hpp
-3
View File
@@ -766,9 +766,6 @@ class basic_json_view
template<typename, typename> friend class detail::view::view_side;
friend iterator;
/// whether the view is one of an editable document
static constexpr bool is_editable = Editable;
basic_json_view(const document_data* d, const node* n) noexcept
: m_doc(d), m_node(n)
{}
single_include/nlohmann/json_view.hpp
Generated
-3
View File
@@ -10365,9 +10365,6 @@ class basic_json_view
template<typename, typename> friend class detail::view::view_side;
friend iterator;
/// whether the view is one of an editable document
static constexpr bool is_editable = Editable;
basic_json_view(const document_data* d, const node* n) noexcept
: m_doc(d), m_node(n)
{}