From 02805e87e0d2cfa18f5c4207b596c3cdb59698dd Mon Sep 17 00:00:00 2001
From: Joana Niermann <joana.niermann@cern.ch>
Date: Thu, 25 Jul 2024 00:19:32 +0200
Subject: [PATCH] MSVC fixes

---
 .../algebra/math/impl/vc_aos_transform3.hpp   |  5 ++-
 .../include/algebra/storage/matrix44.hpp      | 41 +++----------------
 .../vc_soa/include/algebra/storage/vc_soa.hpp |  4 +-
 tests/vc_soa/vc_soa.cpp                       |  1 -
 4 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/math/vc_aos/include/algebra/math/impl/vc_aos_transform3.hpp b/math/vc_aos/include/algebra/math/impl/vc_aos_transform3.hpp
index 78c3ce05..275f4334 100644
--- a/math/vc_aos/include/algebra/math/impl/vc_aos_transform3.hpp
+++ b/math/vc_aos/include/algebra/math/impl/vc_aos_transform3.hpp
@@ -210,8 +210,9 @@ struct transform3 {
   ///
   /// @param m is the rotation matrix
   /// @param v is the vector to be rotated
-  ALGEBRA_HOST_DEVICE
-  inline constexpr auto rotate(const matrix44 &m, const vector3 &v) const {
+  template <typename vector3_type>
+  ALGEBRA_HOST_DEVICE inline constexpr auto rotate(
+      const matrix44 &m, const vector3_type &v) const {
 
     return m.x * v[0] + m.y * v[1] + m.z * v[2];
   }
diff --git a/storage/common/include/algebra/storage/matrix44.hpp b/storage/common/include/algebra/storage/matrix44.hpp
index 4cff0ba2..dc95eef7 100644
--- a/storage/common/include/algebra/storage/matrix44.hpp
+++ b/storage/common/include/algebra/storage/matrix44.hpp
@@ -97,42 +97,13 @@ struct matrix44 {
 /// Functor used to access elements of matrix44
 struct element_getter {
 
-  /// Get const access to a matrix element
-  template <template <typename, std::size_t> class array_t, typename value_t,
-            std::size_t N>
-  ALGEBRA_HOST inline decltype(auto) operator()(
-      const matrix44<array_t, value_t, N> &m, std::size_t row,
-      std::size_t col) const {
-
-    // Make sure that the indices are valid.
-    assert(row < 4u);
-    assert(col < 4u);
-
-    // Return the selected element.
-    switch (col) {
-      case 0u:
-        return m.x[row];
-      case 1u:
-        return m.y[row];
-      case 2u:
-        return m.z[row];
-      case 3u:
-        return m.t[row];
-      default:
-#ifndef _MSC_VER
-        __builtin_unreachable();
-#else
-        return m.x[0];
-#endif
-    }
-  }
-
   /// Get non-const access to a matrix element
-  template <template <typename, std::size_t> class array_t, typename value_t,
-            std::size_t N>
-  ALGEBRA_HOST inline decltype(auto) operator()(
-      matrix44<array_t, value_t, N> &m, std::size_t row,
-      std::size_t col) const {
+  template <typename matrix44_t,
+            std::enable_if_t<
+                detail::is_storage_vector_v<typename matrix44_t::vector_type>,
+                bool> = true>
+  ALGEBRA_HOST inline decltype(auto) operator()(matrix44_t &m, std::size_t row,
+                                                std::size_t col) const {
 
     // Make sure that the indices are valid.
     assert(row < 4u);
diff --git a/storage/vc_soa/include/algebra/storage/vc_soa.hpp b/storage/vc_soa/include/algebra/storage/vc_soa.hpp
index c138117a..0e5664ad 100644
--- a/storage/vc_soa/include/algebra/storage/vc_soa.hpp
+++ b/storage/vc_soa/include/algebra/storage/vc_soa.hpp
@@ -35,10 +35,10 @@ template <typename T>
 using value_type = Vc::Vector<T>;
 /// Vector type used in the Vc SoA storage model
 template <typename T, std::size_t N>
-using vector_type = storage::vector<N, value_type<T>, std::array>;
+using vector_type = storage::vector<N, value_type<T>, storage_type>;
 /// Matrix type used in the Vc SoA storage model
 template <typename T, size_type ROWS, size_type COLS>
-using matrix_type = storage::vector<ROWS * COLS, value_type<T>, std::array>;
+using matrix_type = storage::vector<ROWS * COLS, value_type<T>, storage_type>;
 
 /// 2-element "vector" type, using @c Vc::Vector in every element
 template <typename T>
diff --git a/tests/vc_soa/vc_soa.cpp b/tests/vc_soa/vc_soa.cpp
index 33187f51..0af8fa9c 100644
--- a/tests/vc_soa/vc_soa.cpp
+++ b/tests/vc_soa/vc_soa.cpp
@@ -143,7 +143,6 @@ TEST(test_vc_host, vc_soa_transform3) {
   // Value type is Vc::Vector<float>
   using value_t = typename vector3::value_type;
   using transform3 = vc_soa::transform3<scalar_t>;
-  using transform3 = vc_soa::transform3<scalar_t>;
 
   transform3 idty{};