Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

exclude fallback functions when FMT_BUILTIN_CLZ(LL) is not defined #2434

Merged
merged 4 commits into from
Jul 25, 2021
Merged

exclude fallback functions when FMT_BUILTIN_CLZ(LL) is not defined #2434

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
901d2a7
exclude fallback functions when FMT_BUILTIN_CLZ(LL) is not defined
Jul 25, 2021
ebbbea6
moved ifdefs before function comments
Jul 25, 2021
ab273b4
exclude fallback functions when FMT_BUILTIN_CLZ(LL) is not defined
Jul 25, 2021
bf23d97
Merge remote-tracking branch 'origin/master'
Jul 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions include/fmt/format.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,7 @@ FMT_CONSTEXPR inline auto count_digits(uint128_t n) -> int {
}
#endif

#ifdef FMT_BUILTIN_CLZLL
// It is a separate function rather than a part of count_digits to workaround
// the lack of static constexpr in constexpr functions.
inline auto do_count_digits(uint64_t n) -> int {
Expand All @@ -934,6 +935,7 @@ inline auto do_count_digits(uint64_t n) -> int {
10000000000000000000ULL};
return t - (n < zero_or_powers_of_10[t]);
}
#endif

// Returns the number of decimal digits in n. Leading zeros are not counted
// except for n == 0 in which case count_digits returns 1.
Expand Down Expand Up @@ -962,6 +964,7 @@ FMT_CONSTEXPR auto count_digits(UInt n) -> int {

template <> auto count_digits<4>(detail::fallback_uintptr n) -> int;

#ifdef FMT_BUILTIN_CLZ
// It is a separate function rather than a part of count_digits to workaround
// the lack of static constexpr in constexpr functions.
FMT_INLINE auto do_count_digits(uint32_t n) -> int {
Expand All @@ -984,6 +987,7 @@ FMT_INLINE auto do_count_digits(uint32_t n) -> int {
auto inc = table[FMT_BUILTIN_CLZ(n | 1) ^ 31];
return static_cast<int>((n + inc) >> 32);
}
#endif

// Optional version of count_digits for better performance on 32-bit platforms.
FMT_CONSTEXPR20 inline auto count_digits(uint32_t n) -> int {
Expand Down