Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/microsoft/GSL.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChangming Sun <chasun@microsoft.com>2022-11-08 01:00:32 +0300
committerGitHub <noreply@github.com>2022-11-08 01:00:32 +0300
commit517ed29228d18cf2c5004d10826090108e06f049 (patch)
treef01ea08443d2c27843ca937cc93ef40e074110cd
parentd69e578519840b9b74eff26ac01465ac07698063 (diff)
Fix GSL_SUPPRESS definition when nvcc is in-use (#1064)HEADmain
-rw-r--r--include/gsl/assert2
-rw-r--r--include/gsl/byte2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/gsl/assert b/include/gsl/assert
index a601204..a5c216f 100644
--- a/include/gsl/assert
+++ b/include/gsl/assert
@@ -48,7 +48,7 @@
#if defined(__clang__)
#define GSL_SUPPRESS(x) [[gsl::suppress("x")]]
#else
-#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
+#if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__NVCC__)
#define GSL_SUPPRESS(x) [[gsl::suppress(x)]]
#else
#define GSL_SUPPRESS(x)
diff --git a/include/gsl/byte b/include/gsl/byte
index 9231340..f92a91c 100644
--- a/include/gsl/byte
+++ b/include/gsl/byte
@@ -24,7 +24,7 @@
#if defined(__clang__)
#define GSL_SUPPRESS(x) [[gsl::suppress("x")]]
#else
-#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
+#if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__NVCC__)
#define GSL_SUPPRESS(x) [[gsl::suppress(x)]]
#else
#define GSL_SUPPRESS(x)