From 23ecff31839b4e57e3c7f7a2ce8de18cd1b51108 Mon Sep 17 00:00:00 2001
From: tcclevenger <tccleve@sandia.gov>
Date: Wed, 28 Aug 2024 23:25:52 -0600
Subject: [PATCH 1/2] disable empty return for _NVCOMPILER

---
 include/experimental/__p2642_bits/layout_padded.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/experimental/__p2642_bits/layout_padded.hpp b/include/experimental/__p2642_bits/layout_padded.hpp
index e5f7bee4..ef10e0ed 100644
--- a/include/experimental/__p2642_bits/layout_padded.hpp
+++ b/include/experimental/__p2642_bits/layout_padded.hpp
@@ -60,7 +60,7 @@ MDSPAN_INLINE_FUNCTION constexpr size_t get_actual_static_padding_value() {
     return dynamic_extent;
   }
   // Missing return statement warning from NVCC and ICC
-#if defined(__NVCC__) || defined(__INTEL_COMPILER)
+#if (defined(__NVCC__) || defined(__INTEL_COMPILER)) && !defined(__NVCOMPILER)
   return 0;
 #endif
 }
@@ -106,7 +106,7 @@ struct padded_extent {
       return init_padding(exts, padding_value);
     }
     // Missing return statement warning from NVCC and ICC
-#if defined(__NVCC__) || defined(__INTEL_COMPILER)
+#if (defined(__NVCC__) || defined(__INTEL_COMPILER)) && !defined(__NVCOMPILER)
     return {};
 #endif
   }
@@ -121,7 +121,7 @@ struct padded_extent {
       return {};
     }
     // Missing return statement warning from NVCC and ICC
-#if defined(__NVCC__) || defined(__INTEL_COMPILER)
+#if (defined(__NVCC__) || defined(__INTEL_COMPILER)) && !defined(__NVCOMPILER)
     return {};
 #endif
   }
@@ -136,7 +136,7 @@ struct padded_extent {
       return {};
     }
     // Missing return statement warning from NVCC and ICC
-#if defined(__NVCC__) || defined(__INTEL_COMPILER)
+#if (defined(__NVCC__) || defined(__INTEL_COMPILER)) && !defined(__NVCOMPILER)
     return {};
 #endif
   }

From 4e1d43cd44f4d90eb2f0ad89422dd792626238aa Mon Sep 17 00:00:00 2001
From: Damien L-G <dalg24+github@gmail.com>
Date: Thu, 29 Aug 2024 07:11:42 -0400
Subject: [PATCH 2/2] Fix MSVC CI build (drop unsupported argument passed to
 ctest)

```
Run ctest --output-on-failure --
CMake Error: Unknown argument: --
CMake Error: Run 'ctest --help' for all supported options.
---
 .github/workflows/cmake-windows.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml
index aacc9e98..51d1f4f1 100644
--- a/.github/workflows/cmake-windows.yml
+++ b/.github/workflows/cmake-windows.yml
@@ -39,7 +39,7 @@ jobs:
     - name: Test
       working-directory: ${{github.workspace}}/mdspan-build
       shell: bash
-      run: ctest --output-on-failure --
+      run: ctest --output-on-failure
 
     - name: Install
       shell: bash