Merge pull request #349 from masterleinad/icc-warnings

Workaround icpc warnings for missing return types
kokkos · Jun 20, 2024 · c9c4ba3 · c9c4ba3
2 parents 6f20467 + 4a5a5ae
commit c9c4ba3
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/include/experimental/__p2642_bits/layout_padded.hpp b/include/experimental/__p2642_bits/layout_padded.hpp
@@ -59,8 +59,8 @@ MDSPAN_INLINE_FUNCTION constexpr size_t get_actual_static_padding_value() {
   } else {
     return dynamic_extent;
   }
-  // Missing return statement warning from NVCC
-#ifdef __NVCC__
+  // Missing return statement warning from NVCC and ICC
+#if defined(__NVCC__) || defined(__INTEL_COMPILER)
   return 0;
 #endif
 }
@@ -105,9 +105,9 @@ struct padded_extent {
     } else {
       return init_padding(exts, padding_value);
     }
-  // Missing return statement warning from NVCC
-#ifdef __NVCC__
-  return {};
+    // Missing return statement warning from NVCC and ICC
+#if defined(__NVCC__) || defined(__INTEL_COMPILER)
+    return {};
 #endif
   }
 
@@ -120,9 +120,9 @@ struct padded_extent {
     } else {
       return {};
     }
-  // Missing return statement warning from NVCC
-#ifdef __NVCC__
-  return {};
+    // Missing return statement warning from NVCC and ICC
+#if defined(__NVCC__) || defined(__INTEL_COMPILER)
+    return {};
 #endif
   }
 
@@ -135,9 +135,9 @@ struct padded_extent {
     } else {
       return {};
     }
-  // Missing return statement warning from NVCC
-#ifdef __NVCC__
-  return {};
+    // Missing return statement warning from NVCC and ICC
+#if defined(__NVCC__) || defined(__INTEL_COMPILER)
+    return {};
 #endif
   }
 };