Refactor to workaround MSVC bug

MSVC started to fail to recognize typename RightRecord::AccessibleRecordDim as a typename when inside a lambda function.
alpaka-group · Dec 1, 2022 · 92ebb92 · 92ebb92
1 parent 86f2f66
commit 92ebb92
Showing 1 changed file with 14 additions and 24 deletions.
diff --git a/include/llama/RecordRef.hpp b/include/llama/RecordRef.hpp
@@ -48,28 +48,23 @@ namespace llama
             using RightRecord = RecordRef<RightView, RightBoundRecordDim, RightOwnView>;
             // if the record dimension left and right is the same, a single loop is enough and no tag check is needed.
             // this safes a lot of compilation time.
-            if constexpr(std::is_same_v<
-                             typename LeftRecord::AccessibleRecordDim,
-                             typename RightRecord::AccessibleRecordDim>)
+            using LARD = typename LeftRecord::AccessibleRecordDim;
+            using RARD = typename RightRecord::AccessibleRecordDim;
+            if constexpr(std::is_same_v<LARD, RARD>)
             {
-                forEachLeafCoord<typename LeftRecord::AccessibleRecordDim>([&](auto rc) LLAMA_LAMBDA_INLINE
-                                                                           { Functor{}(left(rc), right(rc)); });
+                forEachLeafCoord<LARD>([&](auto rc) LLAMA_LAMBDA_INLINE { Functor{}(left(rc), right(rc)); });
             }
             else
             {
-                forEachLeafCoord<typename LeftRecord::AccessibleRecordDim>(
+                forEachLeafCoord<LARD>(
                     [&](auto leftRC) LLAMA_LAMBDA_INLINE
                     {
                         using LeftInnerCoord = decltype(leftRC);
-                        forEachLeafCoord<typename RightRecord::AccessibleRecordDim>(
+                        forEachLeafCoord<RARD>(
                             [&](auto rightRC) LLAMA_LAMBDA_INLINE
                             {
                                 using RightInnerCoord = decltype(rightRC);
-                                if constexpr(hasSameTags<
-                                                 typename LeftRecord::AccessibleRecordDim,
-                                                 LeftInnerCoord,
-                                                 typename RightRecord::AccessibleRecordDim,
-                                                 RightInnerCoord>)
+                                if constexpr(hasSameTags<LARD, LeftInnerCoord, RARD, RightInnerCoord>)
                                 {
                                     Functor{}(left(leftRC), right(rightRC));
                                 }
@@ -101,28 +96,23 @@ namespace llama
             bool result = true;
             // if the record dimension left and right is the same, a single loop is enough and no tag check is needed.
             // this safes a lot of compilation time.
-            if constexpr(std::is_same_v<
-                             typename LeftRecord::AccessibleRecordDim,
-                             typename RightRecord::AccessibleRecordDim>)
+            using LARD = typename LeftRecord::AccessibleRecordDim;
+            using RARD = typename RightRecord::AccessibleRecordDim;
+            if constexpr(std::is_same_v<LARD, RARD>)
             {
-                forEachLeafCoord<typename LeftRecord::AccessibleRecordDim>(
-                    [&](auto rc) LLAMA_LAMBDA_INLINE { result &= Functor{}(left(rc), right(rc)); });
+                forEachLeafCoord<LARD>([&](auto rc) LLAMA_LAMBDA_INLINE { result &= Functor{}(left(rc), right(rc)); });
             }
             else
             {
-                forEachLeafCoord<typename LeftRecord::AccessibleRecordDim>(
+                forEachLeafCoord<LARD>(
                     [&](auto leftRC) LLAMA_LAMBDA_INLINE
                     {
                         using LeftInnerCoord = decltype(leftRC);
-                        forEachLeafCoord<typename RightRecord::AccessibleRecordDim>(
+                        forEachLeafCoord<RARD>(
                             [&](auto rightRC) LLAMA_LAMBDA_INLINE
                             {
                                 using RightInnerCoord = decltype(rightRC);
-                                if constexpr(hasSameTags<
-                                                 typename LeftRecord::AccessibleRecordDim,
-                                                 LeftInnerCoord,
-                                                 typename RightRecord::AccessibleRecordDim,
-                                                 RightInnerCoord>)
+                                if constexpr(hasSameTags<LARD, LeftInnerCoord, RARD, RightInnerCoord>)
                                 {
                                     result &= Functor{}(left(leftRC), right(rightRC));
                                 }