Merge pull request #947 from martinfalk/feature/vs-build

Feature/vs build
topology-tool-kit · Jun 29, 2023 · d59af1d · d59af1d
2 parents 06f99e3 + fe9067b
commit d59af1d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/core/base/marchingTetrahedra/MarchingTetrahedra.h b/core/base/marchingTetrahedra/MarchingTetrahedra.h
@@ -29,6 +29,7 @@
 // base code includes
 #include <Triangulation.h>
 
+#include <climits>
 #include <queue>
 #include <type_traits>
 
@@ -49,7 +50,7 @@ namespace ttk {
     constexpr unsigned long long int getHash(const unsigned long long int a,
                                              const unsigned long long int b) {
       return (a * b + (a * a) + (b * b) + (a * a * a) * (b * b * b))
-             % ULONG_LONG_MAX;
+             % ULLONG_MAX;
     }
 
     /**

diff --git a/core/vtk/ttkIntegralLines/ttkIntegralLines.cpp b/core/vtk/ttkIntegralLines/ttkIntegralLines.cpp
@@ -425,14 +425,17 @@ int ttkIntegralLines::RequestData(vtkInformation *ttkNotUsed(request),
 #endif
 #endif
   // make the vtk trajectories
-  ttkTemplateMacro(
-    triangulation->getType(),
-    (getTrajectories<TTK_TT>(
-      domain, static_cast<TTK_TT *>(triangulation->getData()), integralLines,
 #ifdef TTK_ENABLE_MPI
-      globalVertexId, globalCellId,
+  ttkTemplateMacro(triangulation->getType(),
+                   (getTrajectories<TTK_TT>(
+                     domain, static_cast<TTK_TT *>(triangulation->getData()),
+                     integralLines, globalVertexId, globalCellId, output)));
+#else
+  ttkTemplateMacro(triangulation->getType(),
+                   (getTrajectories<TTK_TT>(
+                     domain, static_cast<TTK_TT *>(triangulation->getData()),
+                     integralLines, output)));
 #endif
-      output)));
 
   return (int)(status == 0);
 }