[wpilib] Fix format call error under fmt (#44011)

This commit is contained in:
jim wang
2025-02-26 22:48:10 +08:00
committed by GitHub
parent c70d01770e
commit 7010463f55
5 changed files with 40 additions and 2 deletions

View File

@@ -0,0 +1,32 @@
diff --git a/wpimath/src/main/native/include/units/base.h b/wpimath/src/main/native/include/units/base.h
index 3c939f3..09c56e5 100644
--- a/wpimath/src/main/native/include/units/base.h
+++ b/wpimath/src/main/native/include/units/base.h
@@ -183,9 +183,10 @@ namespace units
struct fmt::formatter<units::namespaceName::nameSingular ## _t> \
: fmt::formatter<double> \
{\
- template <typename FormatContext>\
- auto format(const units::namespaceName::nameSingular ## _t& obj,\
- FormatContext& ctx) -> decltype(ctx.out()) \
+ template <typename FmtContext>\
+ auto format(\
+ const units::namespaceName::nameSingular ## _t& obj,\
+ FmtContext& ctx) const\
{\
auto out = ctx.out();\
out = fmt::formatter<double>::format(obj(), ctx);\
@@ -2890,9 +2891,10 @@ namespace units
template <>
struct fmt::formatter<units::dimensionless::dB_t> : fmt::formatter<double>
{
- template <typename FormatContext>
- auto format(const units::dimensionless::dB_t& obj,
- FormatContext& ctx) -> decltype(ctx.out())
+ template <typename FmtContext>
+ auto format(
+ const units::dimensionless::dB_t& obj,
+ FmtContext& ctx) const
{
auto out = ctx.out();
out = fmt::formatter<double>::format(obj(), ctx);

View File

@@ -9,6 +9,7 @@ vcpkg_from_github(
missing-find_dependency.patch
fix-usage.patch
fix-build-error-with-fmt11.patch
fix-fmt.patch #https://github.com/wpilibsuite/allwpilib/pull/6796
)
if("allwpilib" IN_LIST FEATURES)

View File

@@ -1,7 +1,7 @@
{
"name": "wpilib",
"version-date": "2023-08-24",
"port-version": 1,
"port-version": 2,
"description": "WPILib is the software library package for the FIRST Robotics Competition. The core install includes wpiutil, a common utilies library, and ntcore, the base NetworkTables library.",
"homepage": "https://github.com/wpilibsuite/allwpilib",
"license": null,

View File

@@ -9838,7 +9838,7 @@
},
"wpilib": {
"baseline": "2023-08-24",
"port-version": 1
"port-version": 2
},
"wren": {
"baseline": "0.4.0",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d40fba76fe504d60de31286b322d5d4f0e5d65db",
"version-date": "2023-08-24",
"port-version": 2
},
{
"git-tree": "2fcd17f46e3a3690ef340ba7da121efac75e28cc",
"version-date": "2023-08-24",