Merge branch 'develop' into feature/sax2

This commit is contained in:
Niels Lohmann committed 2018-03-13 23:58:17 +01:00
commit abac6a0e84
8 files changed
+238 -20

No files matched your search

+1 -1
View File
@@ -1950,7 +1950,7 @@ class basic_json
const bool ensure_ascii = false) const
{
string_t result;
serializer s(detail::output_adapter<char>(result), indent_char);
serializer s(detail::output_adapter<char, string_t>(result), indent_char);
if (indent >= 0)
{