fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-30 02:37:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup

Browse Source
This commit is contained in:
Victor Zverovich
2024-08-29 11:41:43 -07:00
parent 377cf203e3
commit cd8d01d8cd
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/fmt/base.h
View File

@ -419,7 +419,7 @@ FMT_NORETURN FMT_API void assert_fail(const char* file, int line,
#endif #endif
#ifdef FMT_USE_INT128 #ifdef FMT_USE_INT128
// Do nothing. // Use the provided definition.
#elif defined(__SIZEOF_INT128__) && !defined(__NVCC__) && \ #elif defined(__SIZEOF_INT128__) && !defined(__NVCC__) && \
!(FMT_CLANG_VERSION && FMT_MSC_VERSION) !(FMT_CLANG_VERSION && FMT_MSC_VERSION)
# define FMT_USE_INT128 1 # define FMT_USE_INT128 1
@ -439,11 +439,7 @@ template <typename T> auto convert_for_visit(T) -> monostate { return {}; }
#endif #endif
#ifndef FMT_USE_BITINT #ifndef FMT_USE_BITINT
# if FMT_CLANG_VERSION >= 1400 # define FMT_USE_BITINT (FMT_CLANG_VERSION >= 1400)
# define FMT_USE_BITINT 1
# else
# define FMT_USE_BITINT 0
# endif
#endif #endif
template <class T, int N = 0> struct bitint_traits {}; template <class T, int N = 0> struct bitint_traits {};
@ -451,19 +447,18 @@ template <class T, int N = 0> struct bitint_traits {};
# pragma clang diagnostic push # pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wbit-int-extension" # pragma clang diagnostic ignored "-Wbit-int-extension"
// fmt only supports up to 128 bits https://github.com/fmtlib/fmt/pull/4072
template <int N> struct bitint_traits<_BitInt(N)> { template <int N> struct bitint_traits<_BitInt(N)> {
static constexpr bool is_formattable = N <= 128; static constexpr bool is_formattable = N <= 128;
using formatter_type = conditional_t<(N <= 64), long long, __int128>; using format_type = conditional_t<(N <= 64), long long, __int128>;
}; };
template <int N> struct bitint_traits<unsigned _BitInt(N)> { template <int N> struct bitint_traits<unsigned _BitInt(N)> {
static constexpr bool is_formattable = N <= 128; static constexpr bool is_formattable = N <= 128;
using formatter_type = using format_type =
conditional_t<(N <= 64), unsigned long long, unsigned __int128>; conditional_t<(N <= 64), unsigned long long, unsigned __int128>;
}; };
# pragma clang diagnostic pop # pragma clang diagnostic pop
#endif #endif // FMT_USE_BITINT
// Casts a nonnegative integer to unsigned. // Casts a nonnegative integer to unsigned.
template <typename Int> template <typename Int>

2
include/fmt/format.h
View File

@ -3976,7 +3976,7 @@ class formatter<std::basic_string<Char, Traits, Allocator>, Char>
template <typename T, typename Char> template <typename T, typename Char>
struct formatter<T, Char, struct formatter<T, Char,
enable_if_t<(detail::bitint_traits<T>::is_formattable)>> enable_if_t<(detail::bitint_traits<T>::is_formattable)>>
: formatter<typename detail::bitint_traits<T>::formatter_type, Char> {}; : formatter<typename detail::bitint_traits<T>::format_type, Char> {};
/** /**
* Converts `p` to `const void*` for pointer formatting. * Converts `p` to `const void*` for pointer formatting.