Merge branch 'develop' of https://github.com/nlohmann/json into issue2286

Conflicts: single_include/nlohmann/json.hpp
2026-05-21 13:45:33 +00:00 · 2020-07-23 12:30:07 +02:00
parent 88122467bd a048b72fe1
commit a33c3fdf25
21 changed files with 1886 additions and 1852 deletions
@@ -2334,7 +2334,7 @@ class binary_reader
                success = false;
                break;
            }
-            result.push_back(std::char_traits<char_type>::to_char_type(current));
+            result.push_back(static_cast<typename string_t::value_type>(current));
        };
        return success;
    }