Merge develop

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
Fix the VS2015 build of unit-json_view_edit_values.cpp
2026-10-28 08:45:43 +00:00 · 2026-10-28 07:11:40 +01:00 · 2026-10-27 18:01:12 +01:00
1 changed files with 8 additions and 4 deletions
@@ -54,14 +54,18 @@ int accepts_any(nlohmann::basic_json_view<BasicJsonType, Mode> /*unused*/)
    return Mode == nlohmann::view_mode::editable ? 3 : 4;
 }
-template<typename View>
+// overloads that differ only in the mode; deduction ignores the conversion from
-auto overload(View v) -> decltype(accepts_editable(v))
+// read-only to editable views, so each view picks the overload of its own mode
 // (two templates that differ only in a decltype return type are a redefinition
 // for MSVC 2015)
 template<typename BasicJsonType>
 int overload(nlohmann::basic_json_view<BasicJsonType, nlohmann::view_mode::editable> v)
 {
    return accepts_editable(v);
 }
-template<typename View>
+template<typename BasicJsonType>
-auto overload(View v) -> decltype(accepts_read_only(v))
+int overload(nlohmann::basic_json_view<BasicJsonType, nlohmann::view_mode::read_only> v)
 {
    return accepts_read_only(v);
 }