Rearrange ifdef logic for excluding pre-C++17 fallthrough attributes
This puts Intel and PGI compilers into a separate group and thus makes the intent and logic more obvious.
This commit is contained in:
parent
61422eccaf
commit
97348a2ce0
@ -70,9 +70,11 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if __cplusplus == 201103L || __cplusplus == 201402L
|
#if __cplusplus == 201103L || __cplusplus == 201402L
|
||||||
# if defined(__clang__) && !defined(__INTEL_COMPILER)
|
# if defined(__INTEL_COMPILER) || defined(__PGI)
|
||||||
|
# define FMT_FALLTHROUGH
|
||||||
|
# elif defined(__clang__)
|
||||||
# define FMT_FALLTHROUGH [[clang::fallthrough]]
|
# define FMT_FALLTHROUGH [[clang::fallthrough]]
|
||||||
# elif FMT_GCC_VERSION >= 700 && !defined(__PGI) && !defined(__INTEL_COMPILER) && \
|
# elif FMT_GCC_VERSION >= 700 && \
|
||||||
(!defined(__EDG_VERSION__) || __EDG_VERSION__ >= 520)
|
(!defined(__EDG_VERSION__) || __EDG_VERSION__ >= 520)
|
||||||
# define FMT_FALLTHROUGH [[gnu::fallthrough]]
|
# define FMT_FALLTHROUGH [[gnu::fallthrough]]
|
||||||
# else
|
# else
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user