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

replaced !FMT_ICC_ON_WINDOWS by FMT_ICC_POSIX

Browse Source
This commit is contained in:
Mathias Born 2021-09-24 21:34:36 +02:00
parent 3acda1cf97
commit 17fb5de4a1
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/fmt/core.h
View File

@ -34,13 +34,13 @@
#ifdef __ICL #ifdef __ICL
# define FMT_ICC_VERSION __ICL # define FMT_ICC_VERSION __ICL
# define FMT_ICC_ON_WINDOWS 1 # define FMT_ICC_POSIX 0
#elif defined(__INTEL_COMPILER) #elif defined(__INTEL_COMPILER)
# define FMT_ICC_VERSION __INTEL_COMPILER # define FMT_ICC_VERSION __INTEL_COMPILER
# define FMT_ICC_ON_WINDOWS 0 # define FMT_ICC_POSIX 1
#else #else
# define FMT_ICC_VERSION 0 # define FMT_ICC_VERSION 0
# define FMT_ICC_ON_WINDOWS 0 # define FMT_ICC_POSIX 1
#endif #endif
#ifdef __NVCC__ #ifdef __NVCC__

12
include/fmt/format.h
View File

@ -166,12 +166,12 @@ FMT_END_NAMESPACE
# define FMT_BUILTIN_CLZLL(n) __builtin_clzll(n) # define FMT_BUILTIN_CLZLL(n) __builtin_clzll(n)
#endif #endif
#if (FMT_GCC_VERSION || FMT_HAS_BUILTIN(__builtin_ctz) || FMT_ICC_VERSION) && \ #if (FMT_GCC_VERSION || FMT_HAS_BUILTIN(__builtin_ctz) || FMT_ICC_VERSION) && \
!FMT_ICC_ON_WINDOWS FMT_ICC_POSIX
# define FMT_BUILTIN_CTZ(n) __builtin_ctz(n) # define FMT_BUILTIN_CTZ(n) __builtin_ctz(n)
#endif #endif
#if (FMT_GCC_VERSION || FMT_HAS_BUILTIN(__builtin_ctzll) || \ #if (FMT_GCC_VERSION || FMT_HAS_BUILTIN(__builtin_ctzll) || \
FMT_ICC_VERSION) && \ FMT_ICC_VERSION) && \
!FMT_ICC_ON_WINDOWS FMT_ICC_POSIX
# define FMT_BUILTIN_CTZLL(n) __builtin_ctzll(n) # define FMT_BUILTIN_CTZLL(n) __builtin_ctzll(n)
#endif #endif
@ -187,9 +187,6 @@ FMT_BEGIN_NAMESPACE
namespace detail { namespace detail {
// Avoid Clang with Microsoft CodeGen's -Wunknown-pragmas warning. // Avoid Clang with Microsoft CodeGen's -Wunknown-pragmas warning.
# if !defined(__clang__) # if !defined(__clang__)
# if !defined(__ICL)
# pragma managed(push, off)
# endif
# pragma intrinsic(_BitScanForward) # pragma intrinsic(_BitScanForward)
# pragma intrinsic(_BitScanReverse) # pragma intrinsic(_BitScanReverse)
# if defined(_WIN64) # if defined(_WIN64)
@ -251,11 +248,6 @@ inline auto ctzll(uint64_t x) -> int {
return static_cast<int>(r); return static_cast<int>(r);
} }
# define FMT_BUILTIN_CTZLL(n) detail::ctzll(n) # define FMT_BUILTIN_CTZLL(n) detail::ctzll(n)
# if !defined(__clang__)
# if !defined(__ICL)
# pragma managed(pop)
# endif
# endif
} // namespace detail } // namespace detail
FMT_END_NAMESPACE FMT_END_NAMESPACE
#endif #endif