diff options
| author | Thiago M. de C. Marques <thiago_manhente@live.com> | 2020-08-05 18:30:24 -0300 |
|---|---|---|
| committer | Thiago M. de C. Marques <thiago_manhente@live.com> | 2020-08-05 18:30:24 -0300 |
| commit | ca3bf7710feffc6ec949b00bcb7eb97c054ac16c (patch) | |
| tree | 9fa3eb2a3c81e112031ebcf76a0867c0ea2cb910 | |
| parent | 559f8cfaaea8ba5779219a89f938b70ca7c514b1 (diff) | |
| download | platform_external_Microsoft-GSL-ca3bf7710feffc6ec949b00bcb7eb97c054ac16c.tar.gz platform_external_Microsoft-GSL-ca3bf7710feffc6ec949b00bcb7eb97c054ac16c.tar.bz2 platform_external_Microsoft-GSL-ca3bf7710feffc6ec949b00bcb7eb97c054ac16c.zip | |
Fix GSL_SUPPRESS definition on Intel C++ Compiler
Intel C++ Compiler defines the `_MSC_VER` macro, but it doesn't support `[[gsl::*]]` attributes.
| -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) |