Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 18:45:43 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'windows-build-fixes'

Browse Source 
cd8b41f47 Fix type conversion warnings
560861597 Disable header testing in PPP2 mesh_dem_meshtypes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1428
This commit is contained in:
Kenneth Moreland 2018-10-05 16:37:09 +00:00 committed by Kitware Robot
commit fc6728342f
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/contour_tree_augmented/ContourTreeApp.cxx
View File

@ -246,9 +246,8 @@ int main(int argc, char* argv[])
// Compute the number of vertices, i.e., xdim * ydim * zdim
auto nDims = dims.size();
std::vector<vtkm::Float32>::size_type nVertices =
std::vector<vtkm::Float32>::size_type(std::accumulate(
dims.begin(), dims.end(), 1, std::multiplies<std::vector<vtkm::Float32>::size_type>()));
std::vector<vtkm::Float32>::size_type nVertices = std::vector<vtkm::Float32>::size_type(
std::accumulate(dims.begin(), dims.end(), vtkm::Id(1), std::multiplies<vtkm::Id>()));
// Print the mesh metadata
std::cout << "Number of dimensions: " << nDims << std::endl;

2
vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_2D/CMakeLists.txt
View File

@ -66,6 +66,8 @@
set(headers
ExecutionObject_MeshStructure.h
Types.h
# Testing on windows causes access issues with compiler database files for some reason
TESTABLE OFF
)
#-----------------------------------------------------------------------------

2
vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_3D/CMakeLists.txt
View File

@ -66,6 +66,8 @@
set(headers
ExecutionObject_MeshStructure.h
Types.h
# Testing on windows causes access issues with compiler database files for some reason
TESTABLE OFF
)
#-----------------------------------------------------------------------------

2
vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/marchingcubes_3D/CMakeLists.txt
View File

@ -66,6 +66,8 @@
set(headers
ExecutionObject_MeshStructure.h
Types.h
# Testing on windows causes access issues with compiler database files for some reason
TESTABLE OFF
)
#-----------------------------------------------------------------------------