j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop' into feature/undo-number-roundtrip

Browse source
This commit is contained in:
Niels 2016-06-19 17:59:53 +02:00
commit b47fdf88ee
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/src/unit.cpp
View file

@ -1285,7 +1285,7 @@ TEST_CASE("constructors")
SECTION("create a JSON value from an input stream") SECTION("create a JSON value from an input stream")
{ {
SECTION("sts::stringstream") SECTION("std::stringstream")
{ {
std::stringstream ss; std::stringstream ss;
ss << "[\"foo\",1,2,3,false,{\"one\":1}]"; ss << "[\"foo\",1,2,3,false,{\"one\":1}]";
@ -14067,7 +14067,7 @@ TEST_CASE("regression tests")
CHECK(dest == expected); CHECK(dest == expected);
} }
SECTION("issue ##235 - ambiguous overload for 'push_back' and 'operator+='") SECTION("issue #235 - ambiguous overload for 'push_back' and 'operator+='")
{ {
json data = {{"key", "value"}}; json data = {{"key", "value"}};
data.push_back({"key2", "value2"}); data.push_back({"key2", "value2"});