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

[upstream_utils] Fix fmtlib tautological-compare warning from GCC 14 (#6613)

Browse Source 
The patch is from upstream.
This commit is contained in:
Tyler Veness
2024-05-12 10:27:01 -07:00
committed by GitHub
parent d3af27be94
commit 2e828ae053
4 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
upstream_utils/fmt_patches/0001-Suppress-warnings-we-can-t-fix.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Tue, 16 May 2023 13:49:18 -0700
Subject: [PATCH] Suppress warnings we can't fix
Subject: [PATCH 1/2] Suppress warnings we can't fix
---
include/fmt/format.h | 7 +++++++

33
upstream_utils/fmt_patches/0002-Fix-tautological-compare-warning.patch Normal file
View File

@@ -0,0 +1,33 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Victor Zverovich <viz@meta.com>
Date: Mon, 29 Jan 2024 07:48:48 -0800
Subject: [PATCH 2/2] Fix tautological-compare warning
---
include/fmt/ranges.h | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/include/fmt/ranges.h b/include/fmt/ranges.h
index 3638fffb83bce6035c13659f26fe13749c8b19ea..767378c6203fc34e7d763075bd663d2bb6774a97 100644
--- a/include/fmt/ranges.h
+++ b/include/fmt/ranges.h
@@ -206,12 +206,13 @@ class is_tuple_formattable_ {
static constexpr const bool value = false;
};
template <typename T, typename C> class is_tuple_formattable_<T, C, true> {
- template <std::size_t... Is>
- static auto check2(index_sequence<Is...>,
- integer_sequence<bool, (Is == Is)...>) -> std::true_type;
- static auto check2(...) -> std::false_type;
- template <std::size_t... Is>
- static auto check(index_sequence<Is...>) -> decltype(check2(
+ template <size_t... Is>
+ static auto all_true(index_sequence<Is...>,
+ integer_sequence<bool, (Is >= 0)...>) -> std::true_type;
+ static auto all_true(...) -> std::false_type;
+
+ template <size_t... Is>
+ static auto check(index_sequence<Is...>) -> decltype(all_true(
index_sequence<Is...>{},
integer_sequence<bool,
(is_formattable<typename std::tuple_element<Is, T>::type,

1
upstream_utils/update_fmt.py
View File

@@ -21,6 +21,7 @@ def main():
os.chdir(upstream_root)
for f in [
"0001-Suppress-warnings-we-can-t-fix.patch",
"0002-Fix-tautological-compare-warning.patch",
]:
git_am(os.path.join(wpilib_root, "upstream_utils/fmt_patches", f))

13
wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/ranges.h vendored
View File

@@ -206,12 +206,13 @@ class is_tuple_formattable_ {
static constexpr const bool value = false;
};
template <typename T, typename C> class is_tuple_formattable_<T, C, true> {
template <std::size_t... Is>
static auto check2(index_sequence<Is...>,
integer_sequence<bool, (Is == Is)...>) -> std::true_type;
static auto check2(...) -> std::false_type;
template <std::size_t... Is>
static auto check(index_sequence<Is...>) -> decltype(check2(
template <size_t... Is>
static auto all_true(index_sequence<Is...>,
integer_sequence<bool, (Is >= 0)...>) -> std::true_type;
static auto all_true(...) -> std::false_type;
template <size_t... Is>
static auto check(index_sequence<Is...>) -> decltype(all_true(
index_sequence<Is...>{},
integer_sequence<bool,
(is_formattable<typename std::tuple_element<Is, T>::type,