mirror of
https://github.com/microsoft/vcpkg.git
synced 2026-01-18 01:11:23 +01:00
[wpilib] Fix format call error under fmt (#44011)
This commit is contained in:
32
ports/wpilib/fix-fmt.patch
Normal file
32
ports/wpilib/fix-fmt.patch
Normal 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);
|
||||
@@ -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)
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -9838,7 +9838,7 @@
|
||||
},
|
||||
"wpilib": {
|
||||
"baseline": "2023-08-24",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"wren": {
|
||||
"baseline": "0.4.0",
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "d40fba76fe504d60de31286b322d5d4f0e5d65db",
|
||||
"version-date": "2023-08-24",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "2fcd17f46e3a3690ef340ba7da121efac75e28cc",
|
||||
"version-date": "2023-08-24",
|
||||
|
||||
Reference in New Issue
Block a user