diff options
| author | Jordan Maples [MSFT] <49793787+JordanMaples@users.noreply.github.com> | 2020-08-05 15:35:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-05 15:35:26 -0700 |
| commit | f8d9f2e2e3f5e0dce4f49caf3f4b1914dd7607ee (patch) | |
| tree | 394fa4bb1caf69fedf1dd6d783a816a7e6d306a1 | |
| parent | 552eedb3908c5bae4e1bd7250c180ae83e46d2c2 (diff) | |
| parent | ca3bf7710feffc6ec949b00bcb7eb97c054ac16c (diff) | |
| download | platform_external_Microsoft-GSL-f8d9f2e2e3f5e0dce4f49caf3f4b1914dd7607ee.tar.gz platform_external_Microsoft-GSL-f8d9f2e2e3f5e0dce4f49caf3f4b1914dd7607ee.tar.bz2 platform_external_Microsoft-GSL-f8d9f2e2e3f5e0dce4f49caf3f4b1914dd7607ee.zip | |
Merge pull request #906 from TManhente/intel_suppress_fix
Fix GSL_SUPPRESS definition on Intel C++ Compiler
| -rw-r--r-- | include/gsl/gsl_assert | 2 | ||||
| -rw-r--r-- | include/gsl/gsl_byte | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/gsl/gsl_assert b/include/gsl/gsl_assert index 96eaada..3b96117 100644 --- a/include/gsl/gsl_assert +++ b/include/gsl/gsl_assert @@ -45,7 +45,7 @@ #if defined(__clang__) #define GSL_SUPPRESS(x) [[gsl::suppress("x")]] #else -#if defined(_MSC_VER) +#if defined(_MSC_VER) && ! defined(__INTEL_COMPILER) #define GSL_SUPPRESS(x) [[gsl::suppress(x)]] #else #define GSL_SUPPRESS(x) diff --git a/include/gsl/gsl_byte b/include/gsl/gsl_byte index 9e68d0d..c0d78ce 100644 --- a/include/gsl/gsl_byte +++ b/include/gsl/gsl_byte @@ -24,7 +24,7 @@ #if defined(__clang__) #define GSL_SUPPRESS(x) [[gsl::suppress("x")]] #else -#if defined(_MSC_VER) +#if defined(_MSC_VER) && ! defined(__INTEL_COMPILER) #define GSL_SUPPRESS(x) [[gsl::suppress(x)]] #else #define GSL_SUPPRESS(x) |