External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be more explicit.

Browse Source
This commit is contained in:
Olli Lupton 2021-11-04 15:46:36 +01:00
parent 79ab452ff3
commit eafdd3eb81
No known key found for this signature in database
GPG Key ID: 2886C101B2C08D0E
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/fmt/core.h
View File

@ -18,18 +18,33 @@
// The fmt library version in the form major * 10000 + minor * 100 + patch. // The fmt library version in the form major * 10000 + minor * 100 + patch.
#define FMT_VERSION 80001 #define FMT_VERSION 80001
#if defined(__NVCOMPILER)
# define FMT_NVHPC_VERSION \
(__NVCOMPILER_MAJOR__ * 10000 + __NVCOMPILER_MINOR__ * 100 + \
__NVCOMPILER_PATCHLEVEL__)
#else
# define FMT_NVHPC_VERSION 0
#endif
#if defined (__clang__ ) && !defined(__ibmxl__) #if defined (__clang__ ) && !defined(__ibmxl__)
# define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__) # define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__)
#else #else
# define FMT_CLANG_VERSION 0 # define FMT_CLANG_VERSION 0
#endif #endif
#if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && !defined(__NVCOMPILER) #if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && \
!defined(__NVCOMPILER)
# define FMT_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) # define FMT_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
#else #else
# define FMT_GCC_VERSION 0 # define FMT_GCC_VERSION 0
#endif #endif
#if FMT_NVHPC_VERSION > 0
# define FMT_NVHPC_PRAGMA(arg) _Pragma(arg)
#else
# define FMT_NVHPC_PRAGMA(arg)
#endif
#ifndef FMT_GCC_PRAGMA #ifndef FMT_GCC_PRAGMA
// Workaround _Pragma bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59884. // Workaround _Pragma bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59884.
# if FMT_GCC_VERSION >= 504 # if FMT_GCC_VERSION >= 504

7
include/fmt/format.h
View File

@ -967,17 +967,16 @@ FMT_CONSTEXPR20 inline auto count_digits(uint64_t n) -> int {
template <int BITS, typename UInt> template <int BITS, typename UInt>
FMT_CONSTEXPR auto count_digits(UInt n) -> int { FMT_CONSTEXPR auto count_digits(UInt n) -> int {
#ifdef FMT_BUILTIN_CLZ #ifdef FMT_BUILTIN_CLZ
if (num_bits<UInt>() == 32) { if (num_bits<UInt>() == 32)
return (FMT_BUILTIN_CLZ(static_cast<uint32_t>(n) | 1) ^ 31) / BITS + 1; return (FMT_BUILTIN_CLZ(static_cast<uint32_t>(n) | 1) ^ 31) / BITS + 1;
} else
#endif #endif
{ FMT_NVHPC_PRAGMA("diag_suppress initialization_not_reachable")
int num_digits = 0; int num_digits = 0;
FMT_NVHPC_PRAGMA("diag_default initialization_not_reachable")
do { do {
++num_digits; ++num_digits;
} while ((n >>= BITS) != 0); } while ((n >>= BITS) != 0);
return num_digits; return num_digits;
}
} }
template <> auto count_digits<4>(detail::fallback_uintptr n) -> int; template <> auto count_digits<4>(detail::fallback_uintptr n) -> int;