merged #111
This commit is contained in:
parent
6f2da1a39a
commit
b58a93b8dd
4 changed files with 13 additions and 0 deletions
|
@ -373,6 +373,7 @@ I deeply appreciate the help of the following people.
|
||||||
- [易思龙](https://github.com/likebeta) implemented a conversion from anonymous enums.
|
- [易思龙](https://github.com/likebeta) implemented a conversion from anonymous enums.
|
||||||
- [kepkin](https://github.com/kepkin) patiently pushed forward the support for Microsoft Visual studio.
|
- [kepkin](https://github.com/kepkin) patiently pushed forward the support for Microsoft Visual studio.
|
||||||
- [gregmarr](https://github.com/gregmarr) simplified the implementation of reverse iterators.
|
- [gregmarr](https://github.com/gregmarr) simplified the implementation of reverse iterators.
|
||||||
|
- [Caio Luppi](https://github.com/caiovlp) fixed a bug in the Unicode handling.
|
||||||
|
|
||||||
Thanks a lot for helping out!
|
Thanks a lot for helping out!
|
||||||
|
|
||||||
|
|
|
@ -4692,6 +4692,8 @@ class basic_json
|
||||||
// print character c as \uxxxx
|
// print character c as \uxxxx
|
||||||
sprintf(&result[pos + 1], "u%04x", int(c));
|
sprintf(&result[pos + 1], "u%04x", int(c));
|
||||||
pos += 6;
|
pos += 6;
|
||||||
|
// overwrite trailing null character
|
||||||
|
result[pos] = '\\';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -4692,6 +4692,8 @@ class basic_json
|
||||||
// print character c as \uxxxx
|
// print character c as \uxxxx
|
||||||
sprintf(&result[pos + 1], "u%04x", int(c));
|
sprintf(&result[pos + 1], "u%04x", int(c));
|
||||||
pos += 6;
|
pos += 6;
|
||||||
|
// overwrite trailing null character
|
||||||
|
result[pos] = '\\';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -10194,4 +10194,12 @@ TEST_CASE("regression tests")
|
||||||
// hexadecimal "a"
|
// hexadecimal "a"
|
||||||
CHECK(j.dump() == "{\"binary string\":\"\\u0000asdf\\n\",\"int64\":10}");
|
CHECK(j.dump() == "{\"binary string\":\"\\u0000asdf\\n\",\"int64\":10}");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SECTION("issue #111 - subsequent unicode chars")
|
||||||
|
{
|
||||||
|
std::string bytes{0x7, 0x7};
|
||||||
|
json j;
|
||||||
|
j["string"] = bytes;
|
||||||
|
CHECK(j["string"] == "\u0007\u0007");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue