Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01:43 +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

2
ntcore/src/main/native/cpp/ConnectionList.cpp
View File

@@ -5,7 +5,7 @@
#include "ConnectionList.h"
#include <wpi/SmallVector.h>
#include <wpi/json_serializer.h>
#include <wpi/json.h>
#include <wpi/raw_ostream.h>
#include "IListenerStorage.h"

6
ntcore/src/main/native/cpp/jni/NetworkTablesJNI.cpp
View File

@@ -719,7 +719,7 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setTopicProperty
{
wpi::json j;
try {
j = wpi::json::parse(JStringRef{env, value});
j = wpi::json::parse(std::string_view{JStringRef{env, value}});
} catch (wpi::json::parse_error& err) {
illegalArgEx.Throw(
env, fmt::format("could not parse value JSON: {}", err.what()));
@@ -763,7 +763,7 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setTopicProperties
{
wpi::json j;
try {
j = wpi::json::parse(JStringRef{env, properties});
j = wpi::json::parse(std::string_view{JStringRef{env, properties}});
} catch (wpi::json::parse_error& err) {
illegalArgEx.Throw(
env, fmt::format("could not parse properties JSON: {}", err.what()));
@@ -828,7 +828,7 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_publishEx
{
wpi::json j;
try {
j = wpi::json::parse(JStringRef{env, properties});
j = wpi::json::parse(std::string_view{JStringRef{env, properties}});
} catch (wpi::json::parse_error& err) {
illegalArgEx.Throw(
env, fmt::format("could not parse properties JSON: {}", err.what()));

2
ntcore/src/main/native/cpp/net/ServerImpl.cpp
View File

@@ -17,7 +17,7 @@
#include <wpi/MessagePack.h>
#include <wpi/SmallVector.h>
#include <wpi/StringExtras.h>
#include <wpi/json_serializer.h>
#include <wpi/json.h>
#include <wpi/raw_ostream.h>
#include <wpi/timestamp.h>

2
ntcore/src/main/native/cpp/net/WireEncoder.cpp
View File

@@ -6,7 +6,7 @@
#include <optional>
#include <wpi/json_serializer.h>
#include <wpi/json.h>
#include <wpi/mpack.h>
#include <wpi/raw_ostream.h>