minor post-merge fixes

Autodesk · Dec 12, 2023 · 9ed416a · 9ed416a
1 parent 4d388da
commit 9ed416a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/libNeonDomain/include/Neon/domain/details/bGrid/bPartition_imp.h b/libNeonDomain/include/Neon/domain/details/bGrid/bPartition_imp.h
@@ -81,25 +81,26 @@ inline NEON_CUDA_HOST_DEVICE auto bPartition<T, C, SBlock>::
 
 template <typename T, int C, typename SBlock>
 inline NEON_CUDA_HOST_DEVICE auto bPartition<T, C, SBlock>::
-operator()(const Idx& cell,
+                                  operator()(const Idx& cell,
            int        card) -> T&
 {
     return mMem[helpGetPitch(cell, card)];
 }
 
 template <typename T, int C, typename SBlock>
 inline NEON_CUDA_HOST_DEVICE auto bPartition<T, C, SBlock>::
-operator()(const Idx& cell,
+                                  operator()(const Idx& cell,
            int        card) const -> const T&
 {
     return mMem[helpGetPitch(cell, card)];
 }
 
-    template <typename T, int C, typename SBlock>
-    NEON_CUDA_HOST_DEVICE inline auto bPartition<T, C, SBlock>::
-    mem() const -> T const *{
-        return mMem;
-    }
+template <typename T, int C, typename SBlock>
+NEON_CUDA_HOST_DEVICE inline auto bPartition<T, C, SBlock>::
+    mem() const -> T const*
+{
+    return mMem;
+}
 
 template <typename T, int C, typename SBlock>
 inline NEON_CUDA_HOST_DEVICE auto bPartition<T, C, SBlock>::

diff --git a/libNeonDomain/include/Neon/domain/details/dGridDisg/dSpan_imp.h b/libNeonDomain/include/Neon/domain/details/dGridDisg/dSpan_imp.h
@@ -35,7 +35,7 @@ dSpan::setAndValidate(Idx&            idx,
                 offsetLocalNoCard += size_t(idx.setLocation().z - 2) * mSpanDim.x * mSpanDim.y;
             }
 
-            idx.setRegionFirstZ(regionFirstZ);
+            idx.setRegionFirstZ(int32_t(regionFirstZ));
             idx.setOffsetLocalNoCard(offsetLocalNoCard);
             idx.setRegionZDim(regionZDim);