fixes for msvc 14.41

NVIDIA · Dec 19, 2024 · c44d3f0 · c44d3f0
1 parent d6253b5
commit c44d3f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/cudax/include/cuda/experimental/__memory_resource/any_resource.cuh b/cudax/include/cuda/experimental/__memory_resource/any_resource.cuh
@@ -307,7 +307,7 @@ private:
   static_assert(_CUDA_VMR::__contains_execution_space_property<_Properties...>,
                 "The properties of cuda::experimental::any_resource must contain at least one execution space "
                 "property!");
-  using __base_t = __cudax::basic_any<__iresource<_Properties...>>;
+  using __base_t = __cudax::basic_any<__cudax::__iresource<_Properties...>>;
   using __base_t::interface;
 
 public:
@@ -340,7 +340,7 @@ private:
   template <class...>
   friend struct any_resource;
 
-  using __base_t = __cudax::basic_any<__iasync_resource<_Properties...>>;
+  using __base_t = __cudax::basic_any<__cudax::__iasync_resource<_Properties...>>;
   using __base_t::interface;
 
   __base_t& __base() noexcept
@@ -364,7 +364,7 @@ private:
   static_assert(_CUDA_VMR::__contains_execution_space_property<_Properties...>,
                 "The properties of cuda::experimental::resource_ref must contain at least one execution space "
                 "property!");
-  using __base_t = __cudax::basic_any<__iresource<_Properties...>&>;
+  using __base_t = __cudax::basic_any<__cudax::__iresource<_Properties...>&>;
   using __base_t::interface;
 
 public:
@@ -401,7 +401,7 @@ private:
   template <class...>
   friend struct resource_ref;
 
-  using __base_t = __cudax::basic_any<__iasync_resource<_Properties...>&>;
+  using __base_t = __cudax::basic_any<__cudax::__iasync_resource<_Properties...>&>;
   using __base_t::interface;
 
   __base_t& __base() noexcept

diff --git a/libcudacxx/include/cuda/std/__mdspan/extents.h b/libcudacxx/include/cuda/std/__mdspan/extents.h
@@ -140,6 +140,7 @@ class extents
   // internal typedefs which for technical reasons are public
   using __storage_t =
     __detail::__partially_static_sizes_tagged<__detail::__extents_tag, index_type, size_t, _Extents...>;
+  using __indices_t = _CUDA_VSTD::integer_sequence<size_t, _Extents...>;
 
 #  ifndef _CCCL_HAS_NO_ATTRIBUTE_NO_UNIQUE_ADDRESS
   _CCCL_NO_UNIQUE_ADDRESS __storage_t __storage_;
@@ -251,7 +252,7 @@ class extents
     /* multi-stage check to protect from invalid pack expansion when sizes don't match? */
     (decltype(__detail::__check_compatible_extents(
       integral_constant<bool, sizeof...(_Extents) == sizeof...(_OtherExtents)>{},
-      _CUDA_VSTD::integer_sequence<size_t, _Extents...>{},
+      __indices_t{}, // _CUDA_VSTD::integer_sequence<size_t, _Extents...>{}
       _CUDA_VSTD::integer_sequence<size_t, _OtherExtents...>{}))::value))
   _LIBCUDACXX_HIDE_FROM_ABI __MDSPAN_CONDITIONAL_EXPLICIT(
     (((_Extents != dynamic_extent) && (_OtherExtents == dynamic_extent)) || ...)