Commit 80c8a03d authored by miller86's avatar miller86

2.7RC->Trunk; fixing one-half of #866; engine crash caused by size_t/int type mixing in for loop

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@22832 18c085ea-50e0-402c-830e-de6fd14e8384
parent cddad93e
......@@ -5010,6 +5010,9 @@ avtGenericDatabase::ActivateTimestep(int stateIndex)
// Fixed error where domains[i] wasn't being used to get the correct
// groupName, resulting in incorrect labels for the SIL selection.
//
// Mark C. Miller, Tue Feb 11 19:35:08 PST 2014
// Fix size_t/int type mixing in loop completion expression causing loop
// body to be executed for empty vectors.
// ****************************************************************************
void
......@@ -5204,7 +5207,7 @@ avtGenericDatabase::ReadDataset(avtDatasetCollection &ds, intVector &domains,
else
{
int pos = grpOrigin;
for (int j = 0 ; j < groupIdsBasedOnRange.size()-1 ; j++)
for (int j = 0 ; j < (int) groupIdsBasedOnRange.size()-1 ; j++)
{
if (groupIdsBasedOnRange[j] <= domains[i] && domains[i] < groupIdsBasedOnRange[j+1])
break;
......
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