feedc0de/GSL
1
0
Fork 0
forked from microsoft/GSL
Code Pull Requests Activity

Merge pull request #906 from TManhente/intel_suppress_fix

Browse Source 
Fix  GSL_SUPPRESS definition on Intel C++ Compiler
This commit is contained in:
Jordan Maples [MSFT]
2020-08-05 15:35:26 -07:00
committed by GitHub
parent 552eedb390 ca3bf7710f
commit f8d9f2e2e3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/gsl/gsl_assert
View File

@@ -45,7 +45,7 @@
#if defined(__clang__) #if defined(__clang__)
#define GSL_SUPPRESS(x) [[gsl::suppress("x")]] #define GSL_SUPPRESS(x) [[gsl::suppress("x")]]
#else #else
#if defined(_MSC_VER) #if defined(_MSC_VER) && ! defined(__INTEL_COMPILER)
#define GSL_SUPPRESS(x) [[gsl::suppress(x)]] #define GSL_SUPPRESS(x) [[gsl::suppress(x)]]
#else #else
#define GSL_SUPPRESS(x) #define GSL_SUPPRESS(x)

2
include/gsl/gsl_byte
View File

@@ -24,7 +24,7 @@
#if defined(__clang__) #if defined(__clang__)
#define GSL_SUPPRESS(x) [[gsl::suppress("x")]] #define GSL_SUPPRESS(x) [[gsl::suppress("x")]]
#else #else
#if defined(_MSC_VER) #if defined(_MSC_VER) && ! defined(__INTEL_COMPILER)
#define GSL_SUPPRESS(x) [[gsl::suppress(x)]] #define GSL_SUPPRESS(x) [[gsl::suppress(x)]]
#else #else
#define GSL_SUPPRESS(x) #define GSL_SUPPRESS(x)