petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Fix: false positive warning in fmt library (backport ef55d4f of upstream fmt)

Browse Source
This commit is contained in:
Rubidium
2023-05-22 18:06:05 +02:00
committed by rubidium42
parent 802d6cb509
commit 10e12154f5
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/3rdparty/fmt/core.h vendored
View File

@@ -1666,8 +1666,7 @@ constexpr auto encode_types() -> unsigned long long {
template <typename Context, typename T> template <typename Context, typename T>
FMT_CONSTEXPR FMT_INLINE auto make_value(T&& val) -> value<Context> { FMT_CONSTEXPR FMT_INLINE auto make_value(T&& val) -> value<Context> {
auto&& arg = arg_mapper<Context>().map(FMT_FORWARD(val)); using arg_type = remove_cvref_t<decltype(arg_mapper<Context>().map(val))>;
using arg_type = remove_cvref_t<decltype(arg)>;
constexpr bool formattable_char = constexpr bool formattable_char =
!std::is_same<arg_type, unformattable_char>::value; !std::is_same<arg_type, unformattable_char>::value;
@@ -1686,7 +1685,7 @@ FMT_CONSTEXPR FMT_INLINE auto make_value(T&& val) -> value<Context> {
formattable, formattable,
"Cannot format an argument. To make type T formattable provide a " "Cannot format an argument. To make type T formattable provide a "
"formatter<T> specialization: https://fmt.dev/latest/api.html#udt"); "formatter<T> specialization: https://fmt.dev/latest/api.html#udt");
return {arg}; return {arg_mapper<Context>().map(val)};
} }
template <typename Context, typename T> template <typename Context, typename T>