simplified iterator/index arithmetics using static casts. re gentryx#49

seb-ehm · Nov 4, 2017 · 627a545 · 627a545
1 parent 00f8f26
commit 627a545
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/libgeodecomp/storage/reorderingunstructuredgrid.h b/src/libgeodecomp/storage/reorderingunstructuredgrid.h
@@ -247,9 +247,7 @@ class ReorderingUnstructuredGrid : public GridBase<typename DELEGATE_GRID::CellT
         }
 
 		for (RowLengthVec::iterator i = reorderedRowLengths.begin(); i != reorderedRowLengths.end(); ) {
-			std::size_t currentIndex = i - reorderedRowLengths.begin();
-			std::size_t nextIndex = (std::min)(currentIndex + SIGMA, reorderedRowLengths.size());
-			RowLengthVec::iterator nextStop = reorderedRowLengths.begin() + currentIndex;
+			RowLengthVec::iterator nextStop = static_cast<RowLengthVec::iterator>((std::min)(static_cast<RowLengthVec::size_type>(i) + SIGMA, reorderedRowLengths.end()));
 
 			std::stable_sort(i, nextStop, [](const IntPair& a, const IntPair& b) {
 				return a.second > b.second;