Commit 5fed7dda authored by Kenneth Moreland's avatar Kenneth Moreland

Fix compile issue on windows

A variable length array declaration was used. That is not part of the
official C++11 standard and is not supported on all compilers.
parent 503bebda
......@@ -74,6 +74,7 @@
#include <vtkm/filter/ContourTreeUniform.h>
#include <fstream>
#include <vector>
// Compute and render an isosurface for a uniform grid example
int main(int argc, char* argv[])
......@@ -95,12 +96,14 @@ int main(int argc, char* argv[])
vtkm::Id2 vdims;
inFile >> vdims[0];
inFile >> vdims[1];
vtkm::Id nVertices = vdims[0] * vdims[1];
std::size_t nVertices = static_cast<std::size_t>(vdims[0] * vdims[1]);
// read data
vtkm::Float32 values[nVertices];
for (int vertex = 0; vertex < nVertices; vertex++)
std::vector<vtkm::Float32> values(nVertices);
for (std::size_t vertex = 0; vertex < nVertices; vertex++)
{
inFile >> values[vertex];
}
inFile.close();
// build the input dataset
......@@ -108,7 +111,7 @@ int main(int argc, char* argv[])
vtkm::cont::DataSet inDataSet = dsb.Create(vdims);
vtkm::cont::DataSetFieldAdd dsf;
dsf.AddPointField(inDataSet, "values", values, nVertices);
dsf.AddPointField(inDataSet, "values", values);
// Output data set is pairs of saddle and peak vertex IDs
vtkm::filter::ResultField result;
......
......@@ -74,6 +74,7 @@
#include <vtkm/filter/ContourTreeUniform.h>
#include <fstream>
#include <vector>
// Compute and render an isosurface for a uniform grid example
int main(int argc, char* argv[])
......@@ -96,12 +97,15 @@ int main(int argc, char* argv[])
inFile >> vdims[0];
inFile >> vdims[1];
inFile >> vdims[2];
vtkm::Id nVertices = vdims[0] * vdims[1] * vdims[2];
std::size_t nVertices =
static_cast<std::size_t>(vdims[0] * vdims[1] * vdims[2]);
// read data
vtkm::Float32 values[nVertices];
for (int vertex = 0; vertex < nVertices; vertex++)
std::vector<vtkm::Float32> values(nVertices);
for (std::size_t vertex = 0; vertex < nVertices; vertex++)
{
inFile >> values[vertex];
}
inFile.close();
// build the input dataset
......@@ -109,7 +113,7 @@ int main(int argc, char* argv[])
vtkm::cont::DataSet inDataSet = dsb.Create(vdims);
vtkm::cont::DataSetFieldAdd dsf;
dsf.AddPointField(inDataSet, "values", values, nVertices);
dsf.AddPointField(inDataSet, "values", values);
// Output data set is pairs of saddle and peak vertex IDs
vtkm::filter::ResultField result;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment