Merge long-overdue PTree changes to release (libs)

[SVN r65976]
This commit is contained in:
Sebastian Redl
2010-10-15 12:41:49 +00:00
parent ab64e13f12
commit d0d71452fc
10 changed files with 85 additions and 47 deletions

View File

@@ -235,7 +235,7 @@ const char *ok_data_11 =
"}\n";
const char *ok_data_12 =
"{\" \\\" \\\\ \\0 \\b \\f \\n \\r \\t \" : \"multi\" \"-\" \"string\"}";
"{\" \\\" \\\\ \\b \\f \\n \\r \\t \" : \"multi\" \"-\" \"string\"}";
const char *error_data_1 =
""; // No root object
@@ -342,7 +342,7 @@ void test_json_parser()
generic_parser_test_ok<Ptree, ReadFunc, WriteFunc>
(
ReadFunc(), WriteFunc(), ok_data_12, NULL,
"testok12.json", NULL, "testok12out.json", 2, 12, 19
"testok12.json", NULL, "testok12out.json", 2, 12, 17
);
generic_parser_test_error<ptree, ReadFunc, WriteFunc, json_parser_error>