Commit 64b52248 authored by dpugmire's avatar dpugmire
Browse files

fix compiler warnings.

parent 8e42e5c8
...@@ -183,7 +183,6 @@ public: ...@@ -183,7 +183,6 @@ public:
{ {
vtkm::Id dim1 = this->PortalFirst.GetNumberOfValues(); vtkm::Id dim1 = this->PortalFirst.GetNumberOfValues();
vtkm::Id dim2 = this->PortalSecond.GetNumberOfValues(); vtkm::Id dim2 = this->PortalSecond.GetNumberOfValues();
vtkm::Id dim3 = this->PortalThird.GetNumberOfValues();
vtkm::Id dim12 = dim1*dim2; vtkm::Id dim12 = dim1*dim2;
vtkm::Id idx12 = index % dim12; vtkm::Id idx12 = index % dim12;
vtkm::Id i1 = idx12 % dim1; vtkm::Id i1 = idx12 % dim1;
...@@ -199,7 +198,6 @@ public: ...@@ -199,7 +198,6 @@ public:
{ {
vtkm::Id dim1 = this->PortalFirst.GetNumberOfValues(); vtkm::Id dim1 = this->PortalFirst.GetNumberOfValues();
vtkm::Id dim2 = this->PortalSecond.GetNumberOfValues(); vtkm::Id dim2 = this->PortalSecond.GetNumberOfValues();
vtkm::Id dim3 = this->PortalThird.GetNumberOfValues();
vtkm::Id dim12 = dim1*dim2; vtkm::Id dim12 = dim1*dim2;
vtkm::Id idx12 = index % dim12; vtkm::Id idx12 = index % dim12;
...@@ -430,7 +428,7 @@ public: ...@@ -430,7 +428,7 @@ public:
} }
VTKM_CONT_EXPORT VTKM_CONT_EXPORT
void Shrink(vtkm::Id numberOfValues) void Shrink(vtkm::Id /*numberOfValues*/)
{ {
throw vtkm::cont::ErrorControlBadAllocation("Does not make sense."); throw vtkm::cont::ErrorControlBadAllocation("Does not make sense.");
} }
......
...@@ -117,7 +117,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals, ...@@ -117,7 +117,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals,
std::vector<CoordType> coords(xVals.size()); std::vector<CoordType> coords(xVals.size());
vtkm::Id nPts = static_cast<vtkm::Id>(coords.size()); vtkm::Id nPts = static_cast<vtkm::Id>(coords.size());
for (size_t i=0; i < nPts; i++) for (vtkm::Id i=0; i < nPts; i++)
{ {
coords[i][0] = xVals[i]; coords[i][0] = xVals[i];
coords[i][1] = yVals[i]; coords[i][1] = yVals[i];
...@@ -151,7 +151,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals, ...@@ -151,7 +151,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals,
std::vector<CoordType> coords(xVals.size()); std::vector<CoordType> coords(xVals.size());
vtkm::Id nPts = static_cast<vtkm::Id>(coords.size()); vtkm::Id nPts = static_cast<vtkm::Id>(coords.size());
for (size_t i=0; i < nPts; i++) for (vtkm::Id i=0; i < nPts; i++)
{ {
coords[i][0] = xVals[i]; coords[i][0] = xVals[i];
coords[i][1] = yVals[i]; coords[i][1] = yVals[i];
...@@ -209,7 +209,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals, ...@@ -209,7 +209,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals,
std::vector<CoordType> coords(xVals.size()); std::vector<CoordType> coords(xVals.size());
vtkm::Id nPts = static_cast<vtkm::Id>(coords.size()); vtkm::Id nPts = static_cast<vtkm::Id>(coords.size());
for (size_t i=0; i < nPts; i++) for (vtkm::Id i=0; i < nPts; i++)
{ {
coords[i][0] = xVals[i]; coords[i][0] = xVals[i];
coords[i][1] = yVals[i]; coords[i][1] = yVals[i];
...@@ -246,7 +246,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals, ...@@ -246,7 +246,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals,
std::vector<CoordType> coords(xVals.size()); std::vector<CoordType> coords(xVals.size());
vtkm::Id nPts = static_cast<vtkm::Id>(coords.size()); vtkm::Id nPts = static_cast<vtkm::Id>(coords.size());
for (size_t i=0; i < nPts; i++) for (vtkm::Id i=0; i < nPts; i++)
{ {
coords[i][0] = xVals[i]; coords[i][0] = xVals[i];
coords[i][1] = yVals[i]; coords[i][1] = yVals[i];
......
Supports Markdown
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