Refs #9247. Fixing unchecked return on iterator.

mantidproject · Apr 1, 2014 · beabf6a · beabf6a
1 parent c9d909c
commit beabf6a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkMDLineFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkMDLineFactory.cpp
@@ -97,7 +97,8 @@ namespace Mantid
         double progressFactor = 0.5/double(it->getDataSize());
         double progressOffset = 0.5;
 
-        for(size_t iBox = 0; iBox < it->getDataSize(); ++iBox)
+        size_t iBox = 0;
+        do
         {
           progressUpdating.eventRaised(double(iBox)*progressFactor);
 
@@ -133,8 +134,8 @@ namespace Mantid
           {
             useBox[iBox] = false;
           }
-          it->next();
-        }
+          ++iBox;
+        } while (it->next());
 
         delete[] masks;
         for(size_t ii = 0; ii < it->getDataSize() ; ++ii)

diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkMDQuadFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkMDQuadFactory.cpp
@@ -93,7 +93,8 @@ namespace Mantid
         double progressFactor = 0.5/double(it->getDataSize());
         double progressOffset = 0.5;
 
-        for(size_t iBox = 0; iBox < it->getDataSize(); ++iBox)
+        size_t iBox = 0;
+        do
         {
           progressUpdating.eventRaised(progressFactor * double(iBox));
 
@@ -129,8 +130,8 @@ namespace Mantid
           {
             useBox[iBox] = false;
           }
-          it->next();
-        }
+          ++iBox;
+        } while (it->next());
 
         delete[] masks;
         for(size_t ii = 0; ii < it->getDataSize() ; ++ii)