Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update json from upstream version 3.1.2.

Browse Source 
This adds support for ubjson and makes a number of bugfixes.

Binary input and output have switched from strings to uint8_t arrays.
This commit is contained in:
Peter Johnson
2018-05-14 22:53:22 -07:00
parent c274d1790f
commit f8ed48af98
20 changed files with 8915 additions and 6854 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpiutil/src/test/native/cpp/json/unit-modifiers.cpp
View File

@@ -718,7 +718,7 @@ TEST(JsonSwapTest, NonObjectT)
TEST(JsonSwapTest, StringT)
{
json j = "Hello world";
json::string_t s = "Hallo Welt";
std::string s = "Hallo Welt";
j.swap(s);
@@ -732,7 +732,7 @@ TEST(JsonSwapTest, StringT)
TEST(JsonSwapTest, NonStringT)
{
json j = 17;
json::string_t s = "Hallo Welt";
std::string s = "Hallo Welt";
EXPECT_THROW_MSG(j.swap(s), json::type_error,
"[json.exception.type_error.310] cannot use swap() with number");