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

changed detection of Intel Compiler Classic to distinguish MS-Windows

Browse Source
This commit is contained in:
Mathias Born 2021-09-24 10:33:18 +02:00
parent 2742611cad
commit 3acda1cf97
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/fmt/core.h
View File

@ -32,10 +32,15 @@
# define FMT_GCC_PRAGMA(arg)
#endif
#if defined(__INTEL_COMPILER)
#ifdef __ICL
# define FMT_ICC_VERSION __ICL
# define FMT_ICC_ON_WINDOWS 1
#elif defined(__INTEL_COMPILER)
# define FMT_ICC_VERSION __INTEL_COMPILER
# define FMT_ICC_ON_WINDOWS 0
#else
# define FMT_ICC_VERSION 0
# define FMT_ICC_ON_WINDOWS 0
#endif
#ifdef __NVCC__

23
include/fmt/format.h
View File

@ -49,14 +49,6 @@
# define FMT_GCC_VISIBILITY_HIDDEN
#endif
#ifdef __INTEL_COMPILER
# define FMT_ICC_VERSION __INTEL_COMPILER
#elif defined(__ICL)
# define FMT_ICC_VERSION __ICL
#else
# define FMT_ICC_VERSION 0
#endif
#ifdef __NVCC__
# define FMT_CUDA_VERSION (__CUDACC_VER_MAJOR__ * 100 + __CUDACC_VER_MINOR__)
#else
@ -173,10 +165,13 @@ FMT_END_NAMESPACE
!FMT_MSC_VER
# define FMT_BUILTIN_CLZLL(n) __builtin_clzll(n)
#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
# define FMT_BUILTIN_CTZ(n) __builtin_ctz(n)
#endif
#if (FMT_GCC_VERSION || FMT_HAS_BUILTIN(__builtin_ctzll) || FMT_ICC_VERSION)
#if (FMT_GCC_VERSION || FMT_HAS_BUILTIN(__builtin_ctzll) || \
FMT_ICC_VERSION) && \
!FMT_ICC_ON_WINDOWS
# define FMT_BUILTIN_CTZLL(n) __builtin_ctzll(n)
#endif
@ -192,7 +187,9 @@ FMT_BEGIN_NAMESPACE
namespace detail {
// Avoid Clang with Microsoft CodeGen's -Wunknown-pragmas warning.
# if !defined(__clang__)
# pragma managed(push, off)
# if !defined(__ICL)
# pragma managed(push, off)
# endif
# pragma intrinsic(_BitScanForward)
# pragma intrinsic(_BitScanReverse)
# if defined(_WIN64)
@ -255,7 +252,9 @@ inline auto ctzll(uint64_t x) -> int {
}
# define FMT_BUILTIN_CTZLL(n) detail::ctzll(n)
# if !defined(__clang__)
# pragma managed(pop)
# if !defined(__ICL)
# pragma managed(pop)
# endif
# endif
} // namespace detail
FMT_END_NAMESPACE