Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpiutil] Update json to 3.11.2 (#5680)

Browse Source
This commit is contained in:
PJ Reiniger
2023-10-15 05:53:56 +01:00
committed by GitHub
parent 896772c750
commit 210255bfff
90 changed files with 22540 additions and 28368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
glass/src/lib/native/cpp/Context.cpp
View File

@@ -16,7 +16,6 @@
#include <wpi/StringExtras.h>
#include <wpi/fs.h>
#include <wpi/json.h>
#include <wpi/json_serializer.h>
#include <wpi/raw_ostream.h>
#include <wpi/timestamp.h>
#include <wpigui.h>
@@ -139,7 +138,7 @@ static bool LoadWindowStorageImpl(const std::string& filename) {
} else {
try {
return JsonToWindow(
wpi::json::parse({fileBuffer->begin(), fileBuffer->end()}),
wpi::json::parse(fileBuffer->begin(), fileBuffer->end()),
filename.c_str());
} catch (wpi::json::parse_error& e) {
ImGui::LogText("Error loading %s: %s", filename.c_str(), e.what());
@@ -166,7 +165,7 @@ static bool LoadStorageRootImpl(Context* ctx, const std::string& filename,
}
try {
storage->FromJson(
wpi::json::parse({fileBuffer->begin(), fileBuffer->end()}),
wpi::json::parse(fileBuffer->begin(), fileBuffer->end()),
filename.c_str());
} catch (wpi::json::parse_error& e) {
ImGui::LogText("Error loading %s: %s", filename.c_str(), e.what());

2
glass/src/lib/native/cpp/other/Field2D.cpp
View File

@@ -448,7 +448,7 @@ bool FieldInfo::LoadJson(std::span<const char> is, std::string_view filename) {
// parse file
wpi::json j;
try {
j = wpi::json::parse({is.data(), is.size()});
j = wpi::json::parse(is);
} catch (const wpi::json::parse_error& e) {
fmt::print(stderr, "GUI: JSON: could not parse: {}\n", e.what());
return false;