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

Rename FMT_NVHPC_VERSION to FMT_NVCOMPILER_VERSION

Browse Source
This commit is contained in:
Federico Busato 2022-01-26 15:37:33 -08:00
parent ffba4c74f0
commit 384dc2a4c5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/fmt/core.h
View File

@ -50,9 +50,10 @@
#endif #endif
#ifdef __NVCOMPILER #ifdef __NVCOMPILER
# define FMT_NVHPC_VERSION (__NVCOMPILER_MAJOR__ * 100 + __NVCOMPILER_MINOR__) # define FMT_NVCOMPILER_VERSION \
(__NVCOMPILER_MAJOR__ * 100 + __NVCOMPILER_MINOR__)
#else #else
# define FMT_NVHPC_VERSION 0 # define FMT_NVCOMPILER_VERSION 0
#endif #endif
#ifdef __NVCC__ #ifdef __NVCC__
@ -293,7 +294,7 @@
// Enable minimal optimizations for more compact code in debug mode. // Enable minimal optimizations for more compact code in debug mode.
FMT_GCC_PRAGMA("GCC push_options") FMT_GCC_PRAGMA("GCC push_options")
#if !defined(__OPTIMIZE__) && !FMT_NVHPC_VERSION #if !defined(__OPTIMIZE__) && !FMT_NVCOMPILER_VERSION
FMT_GCC_PRAGMA("GCC optimize(\"Og\")") FMT_GCC_PRAGMA("GCC optimize(\"Og\")")
#endif #endif

4
include/fmt/format.h
View File

@ -160,11 +160,11 @@ FMT_END_NAMESPACE
// https://github.com/fmtlib/fmt/issues/2510. // https://github.com/fmtlib/fmt/issues/2510.
#ifndef __ICL #ifndef __ICL
# if FMT_HAS_BUILTIN(__builtin_ctz) || FMT_GCC_VERSION || \ # if FMT_HAS_BUILTIN(__builtin_ctz) || FMT_GCC_VERSION || \
FMT_ICC_VERSION || FMT_NVHPC_VERSION FMT_ICC_VERSION || FMT_NVCOMPILER_VERSION
# define FMT_BUILTIN_CTZ(n) __builtin_ctz(n) # define FMT_BUILTIN_CTZ(n) __builtin_ctz(n)
# endif # endif
# if FMT_HAS_BUILTIN(__builtin_ctzll) || FMT_GCC_VERSION || \ # if FMT_HAS_BUILTIN(__builtin_ctzll) || FMT_GCC_VERSION || \
FMT_ICC_VERSION || FMT_NVHPC_VERSION FMT_ICC_VERSION || FMT_NVCOMPILER_VERSION
# define FMT_BUILTIN_CTZLL(n) __builtin_ctzll(n) # define FMT_BUILTIN_CTZLL(n) __builtin_ctzll(n)
# endif # endif
#endif #endif