Unverified Commit bc51a8df authored by Axel Kohlmeyer's avatar Axel Kohlmeyer Committed by GitHub

Disable fallthrough attributes for the Intel compilers on Linux and MacOS (#1879)

* Disable fallthrough attributes for the Intel compilers

On MacOS and Linux the Intel compilers may be identified as the
host compilers (Clang or GNU) but do not support the corresponding
compiler specific fallthrough attributes.

* 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.
parent 45da432d
...@@ -70,9 +70,11 @@ ...@@ -70,9 +70,11 @@
#endif #endif
#if __cplusplus == 201103L || __cplusplus == 201402L #if __cplusplus == 201103L || __cplusplus == 201402L
# if defined(__clang__) # 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) && \ # 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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment