Merge topic 'fix_warning' into master

080a7f72 resolve new warning

Merge topic 'fix_warning' into master
080a7f72 resolve new warning
1fb3bd99 · Zack Galbreath · Code Review · f02476b2 · 080a7f72 · 1fb3bd99
Commit 1fb3bd99 authored Jul 24, 2013 by Zack Galbreath Committed by Code Review Jul 24, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

Common/Core/vtkAbstractArray.cxx Common/Core/vtkAbstractArray.cxx +2 -1

No files found.
--- a/Common/Core/vtkAbstractArray.cxx
+++ b/Common/Core/vtkAbstractArray.cxx
@@ -741,7 +741,8 @@ void vtkAbstractArray::UpdateDiscreteValueSet(
  vtkIdType numberOfBlocks =
    numberOfSampleTuples / blockSize +
    (numberOfSampleTuples % blockSize ? 1 : 0);
-  if (numberOfBlocks * blockSize < 2 * this->MaxDiscreteValues)
+  if (static_cast<unsigned int>(numberOfBlocks * blockSize) <
+      2 * this->MaxDiscreteValues)
    {
    numberOfBlocks =
      2 * this->MaxDiscreteValues / blockSize +