Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-01 02:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpiutil] Upgrade to fmt 9.0.0 (#4337)

Browse Source 
fmt removed fmt::make_args_checked since it's no longer needed for
constexpr format string checks.

fmt deprecated implicit conversions from enums to integers in format
arguments, so I added explicit static casts.
This commit is contained in:
Tyler Veness
2022-08-16 15:35:26 -07:00
committed by GitHub
parent 340465c929
commit 151dabb2af
38 changed files with 3522 additions and 3364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp
View File

@@ -609,7 +609,7 @@ cs::CvSink CameraServer::GetVideo(const cs::VideoSource& camera) {
if (kind != cs::VideoSink::kCv) {
auto csShared = GetCameraServerShared();
csShared->SetCameraServerError("expected OpenCV sink, but got {}",
kind);
static_cast<int>(kind));
return cs::CvSink{};
}
return *static_cast<cs::CvSink*>(&it->second);

9
cameraserver/src/main/native/include/cameraserver/CameraServerShared.h
View File

@@ -27,20 +27,17 @@ class CameraServerShared {
template <typename S, typename... Args>
inline void SetCameraServerError(const S& format, Args&&... args) {
SetCameraServerErrorV(format,
fmt::make_args_checked<Args...>(format, args...));
SetCameraServerErrorV(format, fmt::make_format_args(args...));
}
template <typename S, typename... Args>
inline void SetVisionRunnerError(const S& format, Args&&... args) {
SetVisionRunnerErrorV(format,
fmt::make_args_checked<Args...>(format, args...));
SetVisionRunnerErrorV(format, fmt::make_format_args(args...));
}
template <typename S, typename... Args>
inline void ReportDriverStationError(const S& format, Args&&... args) {
ReportDriverStationErrorV(format,
fmt::make_args_checked<Args...>(format, args...));
ReportDriverStationErrorV(format, fmt::make_format_args(args...));
}
};