Commit 27dc5f67 authored by cyrush's avatar cyrush

cyrus' warnings review pass before 2.8RC

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23980 18c085ea-50e0-402c-830e-de6fd14e8384
parent 07d52e03
......@@ -123,8 +123,10 @@ avtSIL::avtSIL(const SILAttributes &atts)
setTable.push_back(0);
collTable.push_back(0);
size_t ii = 0;
int iCurrSet = 0, iCurrMat = 0, iCurrArray = 0, iCurrCol = 0;
int iCurrSet = 0;
int iCurrMat = 0;
int iCurrArray = 0;
int iCurrCol = 0;
const intVector &attsOrder = atts.GetOrder();
const vector<string> &setNames = atts.GetSetNames();
......@@ -134,7 +136,7 @@ avtSIL::avtSIL(const SILAttributes &atts)
const vector<int> &role = atts.GetRole();
const vector<int> &superset = atts.GetSuperset();
for (ii = 0; ii < attsOrder.size(); ii++)
for (size_t ii = 0; ii < attsOrder.size(); ii++)
{
if ((EntryType)attsOrder[ii] == WHOLE_SET)
{
......@@ -176,7 +178,7 @@ avtSIL::avtSIL(const SILAttributes &atts)
if (order.size() != attsOrder.size())
EXCEPTION0(ImproperUseException);
for (ii = 0; ii < order.size(); ii++)
for (size_t ii = 0; ii < order.size(); ii++)
{
if ((int)order[ii] != attsOrder[ii])
EXCEPTION0(ImproperUseException);
......@@ -232,7 +234,6 @@ avtSIL::operator=(const avtSIL &sil)
if (this == &sil)
return *this;
size_t i;
//
// First, clear out what we have in this object.
//
......@@ -256,7 +257,7 @@ avtSIL::operator=(const avtSIL &sil)
// I think we make a copy of the matrix so we can change the
// copy of 'this' that it has.
for (i = 0 ; i < sil.matrices.size() ; i++)
for (size_t i = 0 ; i < sil.matrices.size() ; i++)
{
avtSILMatrix_p new_sm = new avtSILMatrix(*(sil.matrices[i]));
new_sm->SetSIL(this);
......@@ -897,8 +898,7 @@ void
avtSIL::AddMapsToTemporarySet(avtSILSet_p pSet, int setIndex) const
{
//Add maps out for a SILSet created on demand, and contained by a matrix
size_t ii;
for (ii = 0; ii < matrices.size(); ii++)
for (size_t ii = 0; ii < matrices.size(); ii++)
{
int col = matrices[ii]->SetIsInCollection(setIndex);
if (col >= 0)
......@@ -909,7 +909,7 @@ avtSIL::AddMapsToTemporarySet(avtSILSet_p pSet, int setIndex) const
//Add maps in for a SILSet created on demand, and contained
//in another collection
for (ii = 0; ii < collTable.size()-1; ii+=3)
for (size_t ii = 0; ii < collTable.size()-1; ii+=3)
{
if ((EntryType)collTable[ii+1] == COLLECTION)
{
......@@ -1337,7 +1337,6 @@ avtSIL::Print(ostream &out,
std::vector< std::string > perCollInfo,
std::vector< std::string > perMatInfo) const
{
size_t i;
bool useInfo;
useInfo = perSetInfo.size() == (size_t)GetNumSets();
......@@ -1370,7 +1369,7 @@ avtSIL::Print(ostream &out,
size_t nColls = collections.size();
useInfo = perCollInfo.size() == nColls;
for (i = 0 ; i < nColls ; i++)
for (size_t i = 0 ; i < nColls ; i++)
{
out << "Collection " << i << " " << (useInfo ? perCollInfo[i].c_str() : "") << endl;
avtSILCollection_p c = collections[i];
......@@ -1492,19 +1491,18 @@ avtSIL::FindColl(int iColl, EntryType &outType,
bool
avtSIL::IsCompatible(const avtSIL *sil2) const
{
size_t i, j;
if (wholesList.size() != sil2->wholesList.size())
return false;
for (i = 0 ; i < wholesList.size() ; i++)
for (size_t i = 0 ; i < wholesList.size() ; i++)
if (wholesList[i] != sil2->wholesList[i])
return false;
if (sets.size() != sil2->sets.size())
return false;
for (i = 0 ; i < sets.size() ; i++)
for (size_t i = 0 ; i < sets.size() ; i++)
{
if ((sets[i]->GetName() != sil2->sets[i]->GetName()) ||
(sets[i]->GetIdentifier() != sil2->sets[i]->GetIdentifier()))
......@@ -1514,7 +1512,7 @@ avtSIL::IsCompatible(const avtSIL *sil2) const
if (matrices.size() != sil2->matrices.size())
return false;
for (i = 0 ; i < matrices.size() ; i++)
for (size_t i = 0 ; i < matrices.size() ; i++)
{
const vector<int> &role1_1 = matrices[i]->GetSet1();
const vector<int> &role1_2 = matrices[i]->GetSet2();
......@@ -1522,12 +1520,12 @@ avtSIL::IsCompatible(const avtSIL *sil2) const
const vector<int> &role2_2 = sil2->matrices[i]->GetSet2();
if (role1_1.size() != role2_1.size())
return false;
for (j = 0 ; j < role1_1.size() ; j++)
for (size_t j = 0 ; j < role1_1.size() ; j++)
if (role1_1[j] != role2_1[j])
return false;
if (role1_2.size() != role2_2.size())
return false;
for (j = 0 ; j < role1_2.size() ; j++)
for (size_t j = 0 ; j < role1_2.size() ; j++)
if (role1_2[j] != role2_2[j])
return false;
}
......@@ -1535,7 +1533,7 @@ avtSIL::IsCompatible(const avtSIL *sil2) const
if (arrays.size() != sil2->arrays.size())
return false;
for (i = 0 ; i < arrays.size() ; i++)
for (size_t i = 0 ; i < arrays.size() ; i++)
{
if (! arrays[i]->IsCompatible(*(sil2->arrays[i])))
return false;
......
......@@ -482,8 +482,8 @@ avtSILRestriction::SetTopSet(int ts)
EXCEPTION2(BadIndexException, ts, ns);
}
size_t i, found = 0;
for (i = 0 ; i < wholesList.size() && !found; i++)
size_t found = 0;
for (size_t i = 0 ; i < wholesList.size() && !found; i++)
{
if (wholesList[i] == ts)
found = 1;
......@@ -505,7 +505,7 @@ avtSILRestriction::SetTopSet(int ts)
// Turn off the other whole sets that were not selected as "top".
//
size_t listSize = wholesList.size();
for (i = 0 ; i < listSize ; i++)
for (size_t i = 0 ; i < listSize ; i++)
{
if (wholesList[i] != topSet)
{
......@@ -1607,8 +1607,6 @@ avtSILRestriction::GetLeafSets(int ind, vector<int> &leaves) const
{
int timingsHandle = visitTimer->StartTimer();
size_t i, j;
//
// Improbable, but make sure we have valid input.
//
......@@ -1622,7 +1620,7 @@ avtSILRestriction::GetLeafSets(int ind, vector<int> &leaves) const
// This may take some memory, but start off by setting every set as "off"
//
vector<bool> isOn(nSets);
for (i = 0 ; i < (size_t)nSets ; i++)
for (size_t i = 0 ; i < (size_t)nSets ; i++)
{
isOn[i] = false;
}
......@@ -1635,7 +1633,7 @@ avtSILRestriction::GetLeafSets(int ind, vector<int> &leaves) const
avtSILSet_p set = GetSILSet(ind);
const vector<int> &initialMaps = set->GetMapsOut();
vector<int> maps;
for (i = 0 ; i < initialMaps.size() ; i++)
for (size_t i = 0 ; i < initialMaps.size() ; i++)
{
maps.push_back(initialMaps[i]);
}
......@@ -1650,7 +1648,7 @@ avtSILRestriction::GetLeafSets(int ind, vector<int> &leaves) const
vector<bool> alreadyProcessedMap;
size_t numCollections = GetNumCollections();
alreadyProcessedMap.resize(numCollections);
for (i = 0 ; i < numCollections ; i++)
for (size_t i = 0 ; i < numCollections ; i++)
{
alreadyProcessedMap[i] = false;
}
......@@ -1672,7 +1670,7 @@ avtSILRestriction::GetLeafSets(int ind, vector<int> &leaves) const
// Add all of the maps of each of the subsets.
//
size_t numElems = nms->GetNumberOfElements();
for (i = 0 ; i < numElems ; i++)
for (size_t i = 0 ; i < numElems ; i++)
{
int setId = nms->GetElement(i);
isOn[setId] = true;
......@@ -1684,7 +1682,7 @@ avtSILRestriction::GetLeafSets(int ind, vector<int> &leaves) const
continue;
avtSILSet_p set = GetSILSet(setId);
const vector<int> &subsetMap = set->GetMapsOut();
for (j = 0 ; j < subsetMap.size() ; j++)
for (size_t j = 0 ; j < subsetMap.size() ; j++)
{
maps.push_back(subsetMap[j]);
}
......@@ -1698,7 +1696,7 @@ avtSILRestriction::GetLeafSets(int ind, vector<int> &leaves) const
// sort out the interior nodes.
//
leaves.clear();
for (i = 0 ; i < (size_t)nSets ; i++)
for (size_t i = 0 ; i < (size_t)nSets ; i++)
{
if (isOn[i])
{
......@@ -1749,7 +1747,6 @@ avtSILRestriction::GetSubsets(int ind, vector<int> &outsets) const
{
int timingsHandle = visitTimer->StartTimer();
size_t i, j;
//
// Improbable, but make sure we have valid input.
......@@ -1764,7 +1761,7 @@ avtSILRestriction::GetSubsets(int ind, vector<int> &outsets) const
// This may take some memory, but start off by setting every set as "off"
//
vector<bool> isOn(nSets);
for (i = 0 ; i < (size_t)nSets ; i++)
for (size_t i = 0 ; i < (size_t)nSets ; i++)
{
isOn[i] = false;
}
......@@ -1782,7 +1779,7 @@ avtSILRestriction::GetSubsets(int ind, vector<int> &outsets) const
avtSILSet_p set = GetSILSet(ind);
const vector<int> &initialMaps = set->GetMapsOut();
vector<int> maps;
for (i = 0 ; i < initialMaps.size() ; i++)
for (size_t i = 0 ; i < initialMaps.size() ; i++)
{
maps.push_back(initialMaps[i]);
}
......@@ -1796,7 +1793,7 @@ avtSILRestriction::GetSubsets(int ind, vector<int> &outsets) const
vector<bool> alreadyProcessedMap;
size_t numCollections = GetNumCollections();
alreadyProcessedMap.resize(numCollections);
for (i = 0 ; i < numCollections ; i++)
for (size_t i = 0 ; i < numCollections ; i++)
{
alreadyProcessedMap[i] = false;
}
......@@ -1818,7 +1815,7 @@ avtSILRestriction::GetSubsets(int ind, vector<int> &outsets) const
// Add all of the maps of each of the subsets.
//
size_t numElems = nms->GetNumberOfElements();
for (i = 0 ; i < numElems ; i++)
for (size_t i = 0 ; i < numElems ; i++)
{
int setId = nms->GetElement(i);
isOn[setId] = true;
......@@ -1831,7 +1828,7 @@ avtSILRestriction::GetSubsets(int ind, vector<int> &outsets) const
avtSILSet_p set = GetSILSet(setId);
const vector<int> &subsetMap = set->GetMapsOut();
for (j = 0 ; j < subsetMap.size() ; j++)
for (size_t j = 0 ; j < subsetMap.size() ; j++)
{
maps.push_back(subsetMap[j]);
}
......@@ -1845,7 +1842,7 @@ avtSILRestriction::GetSubsets(int ind, vector<int> &outsets) const
// sort out the interior nodes.
//
outsets.clear();
for (i = 0 ; i < (size_t)nSets ; i++)
for (size_t i = 0 ; i < (size_t)nSets ; i++)
if (isOn[i])
outsets.push_back(i);
......@@ -1916,7 +1913,7 @@ avtSILRestriction::SetFromCompatibleRestriction(avtSILRestriction_p silr)
{
int t1 = visitTimer->StartTimer();
bool compatible = false;
size_t i;
vector<int> leaves;
vector<int> otherLeaves;
......@@ -1948,7 +1945,7 @@ avtSILRestriction::SetFromCompatibleRestriction(avtSILRestriction_p silr)
{
// copy over the useSet values
SuspendCorrectnessChecking();
for(i = 0; i < leaves.size(); ++i)
for(size_t i = 0; i < leaves.size(); ++i)
{
useSet[leaves[i]] = silr->useSet[otherLeaves[i]];
}
......@@ -1963,7 +1960,7 @@ avtSILRestriction::SetFromCompatibleRestriction(avtSILRestriction_p silr)
// first, set all the leaves useSet flag to something invalid
// so we can confirm they've all be visited later
//
for (i = 0; i < leaves.size(); i++)
for (size_t i = 0; i < leaves.size(); i++)
useSet[leaves[i]] = 0xAA;
// stacks used for DFS
......@@ -2049,7 +2046,7 @@ avtSILRestriction::SetFromCompatibleRestriction(avtSILRestriction_p silr)
// The latter is the least desireable choice.
// We choose to turn them on.
//
for (i = 0; i < leaves.size(); i++)
for (size_t i = 0; i < leaves.size(); i++)
{
if (useSet[leaves[i]] == 0xAA)
useSet[leaves[i]] = AllUsed;
......@@ -2059,7 +2056,7 @@ avtSILRestriction::SetFromCompatibleRestriction(avtSILRestriction_p silr)
// special pass for materials
avtSILCollection_p otherMatColl = NULL;
for (i = 0 ; i < (size_t)silr->GetNumCollections() ; i++)
for (size_t i = 0 ; i < (size_t)silr->GetNumCollections() ; i++)
{
if (silr->GetSILCollection(i)->GetRole() == SIL_MATERIAL)
{
......@@ -2071,7 +2068,7 @@ avtSILRestriction::SetFromCompatibleRestriction(avtSILRestriction_p silr)
}
}
avtSILCollection_p matColl = NULL;
for (i = 0 ; i < (size_t)GetNumCollections() ; i++)
for (size_t i = 0 ; i < (size_t)GetNumCollections() ; i++)
{
if (GetSILCollection(i)->GetRole() == SIL_MATERIAL)
{
......@@ -2089,7 +2086,7 @@ avtSILRestriction::SetFromCompatibleRestriction(avtSILRestriction_p silr)
// If a material is turned off in the original SIL restriction,
// then turn it off here.
size_t numSubsets = otherMatColl->GetNumberOfSubsets();
for (i = 0 ; i < numSubsets ; i++)
for (size_t i = 0 ; i < numSubsets ; i++)
{
int idx = otherMatColl->GetSubset(i);
if (silr->useSet[idx] == NoneUsed)
......@@ -2100,7 +2097,7 @@ avtSILRestriction::SetFromCompatibleRestriction(avtSILRestriction_p silr)
// special pass for blocks (often refinement levels)
avtSILCollection_p otherBlockColl = NULL;
for (i = 0 ; i < (size_t)silr->GetNumCollections() ; i++)
for (size_t i = 0 ; i < (size_t)silr->GetNumCollections() ; i++)
{
if (silr->GetSILCollection(i)->GetRole() == SIL_BLOCK)
{
......@@ -2112,7 +2109,7 @@ avtSILRestriction::SetFromCompatibleRestriction(avtSILRestriction_p silr)
}
}
avtSILCollection_p blockColl = NULL;
for (i = 0 ; i < (size_t)GetNumCollections() ; i++)
for (size_t i = 0 ; i < (size_t)GetNumCollections() ; i++)
{
if (GetSILCollection(i)->GetRole() == SIL_BLOCK)
{
......@@ -2136,7 +2133,7 @@ avtSILRestriction::SetFromCompatibleRestriction(avtSILRestriction_p silr)
int numSubsets = (numNewSubsets < numOrigSubsets ? numNewSubsets
: numOrigSubsets);
bool lastIsOff = false;
for (i = 0 ; i < (size_t)numSubsets ; i++)
for (size_t i = 0 ; i < (size_t)numSubsets ; i++)
{
lastIsOff = false;
int idx = otherBlockColl->GetSubset(i);
......@@ -2148,7 +2145,7 @@ avtSILRestriction::SetFromCompatibleRestriction(avtSILRestriction_p silr)
}
if (lastIsOff && (numNewSubsets > numOrigSubsets))
{
for (i = (size_t)numSubsets ; i < (size_t)numNewSubsets ; i++)
for (size_t i = (size_t)numSubsets ; i < (size_t)numNewSubsets ; i++)
TurnOffSet(blockColl->GetSubset(i));
}
}
......
......@@ -168,14 +168,13 @@ avtSILRestrictionTraverser::GetEnumerationCount()
{
int count = 0;
size_t i;
avtSILSet_p set = silr->GetSILSet(silr->topSet);
const vector<int> &mapsOut = set->GetMapsOut();
//
// Identify the collection that has role of an enumeration
//
for (i = 0 ; i < mapsOut.size() ; i++)
for (size_t i = 0 ; i < mapsOut.size() ; i++)
{
avtSILCollection_p coll = silr->GetSILCollection(mapsOut[i]);
if (coll->GetRole() == SIL_ENUMERATION)
......@@ -319,7 +318,6 @@ avtSILRestrictionTraverser::GetEnumeration(int index,
{
int count = 0;
size_t i, j;
enumList.clear();
avtSILSet_p set = silr->GetSILSet(silr->topSet);
const vector<int> &mapsOut = set->GetMapsOut();
......@@ -331,7 +329,7 @@ avtSILRestrictionTraverser::GetEnumeration(int index,
bool foundOneOff = false;
int enumGraphIndex = -1;
avtSILCollection_p coll;
for (i = 0 ; (enumGraphIndex == -1) && (i < mapsOut.size()) ; i++)
for (size_t i = 0 ; (enumGraphIndex == -1) && (i < mapsOut.size()) ; i++)
{
coll = silr->GetSILCollection(mapsOut[i]);
if (coll->GetRole() == SIL_ENUMERATION)
......@@ -345,7 +343,7 @@ avtSILRestrictionTraverser::GetEnumeration(int index,
name = coll->GetCategory();
size_t numElems = coll->GetNumberOfSubsets();
enumList.resize(numElems);
for (j = 0 ; j < numElems ; j++)
for (size_t j = 0 ; j < numElems ; j++)
{
// do a tiny bit of work to see if this enum has a graph
avtSILSet_p tmpSet = silr->GetSILSet(coll->GetSubset(j));
......@@ -407,7 +405,6 @@ avtSILRestrictionTraverser::GetEnumeration(int index,
bool
avtSILRestrictionTraverser::GetSpecies(vector<bool> &specList)
{
size_t i, j;
specList.clear();
avtSILSet_p set = silr->GetSILSet(silr->topSet);
const vector<int> &mapsOut = set->GetMapsOut();
......@@ -417,7 +414,7 @@ avtSILRestrictionTraverser::GetSpecies(vector<bool> &specList)
//
const vector<unsigned char> &useSet = silr->useSet;
bool foundOneOff = false;
for (i = 0 ; i < mapsOut.size() ; i++)
for (size_t i = 0 ; i < mapsOut.size() ; i++)
{
avtSILCollection_p coll = silr->GetSILCollection(mapsOut[i]);
if (coll->GetRole() == SIL_SPECIES)
......@@ -428,7 +425,7 @@ avtSILRestrictionTraverser::GetSpecies(vector<bool> &specList)
//
size_t numElems = coll->GetNumberOfSubsets();
specList.resize(numElems);
for (j = 0 ; j < numElems ; j++)
for (size_t j = 0 ; j < numElems ; j++)
{
bool val = (useSet[coll->GetSubset(j)] != NoneUsed ? true : false);
specList[j] = val;
......@@ -519,8 +516,6 @@ avtSILRestrictionTraverser::GetDomainList(vector<int> &list, bool allProcs)
int timingsHandle = visitTimer->StartTimer();
list.clear();
size_t i, j, k;
//
// Throw in the identifiers of anything we are supposed to use. Don't
// worry about repeats for now.
......@@ -543,13 +538,13 @@ avtSILRestrictionTraverser::GetDomainList(vector<int> &list, bool allProcs)
size_t numSets = silr->GetNumSets();
numSets -= 1; // for the top set.
list.resize(numSets);
for (i = 0 ; i < numSets ; i++)
for (size_t i = 0 ; i < numSets ; i++)
list[i] = i;
visitTimer->StopTimer(timingsHandle, "GetDomainList with early return");
return;
}
for (i = 0 ; i < setList.size() ; i++)
for (size_t i = 0 ; i < setList.size() ; i++)
{
int setid = setList[i];
if (silr->useSet[setid] == NoneUsed)
......@@ -589,13 +584,13 @@ avtSILRestrictionTraverser::GetDomainList(vector<int> &list, bool allProcs)
// If a collection is part of a matrix, all of the subsets must
// have the same identifier, so we don't need to consider them.
const vector<int> &outmaps = set->GetRealMapsOut();
for (j = 0 ; j < outmaps.size() ; j++)
for (size_t j = 0 ; j < outmaps.size() ; j++)
{
avtSILCollection_p coll = silr->GetSILCollection(outmaps[j]);
const avtSILNamespace *ns = coll->GetSubsets();
size_t numElems = ns->GetNumberOfElements();
setList.reserve(setList.size() + numElems);
for (k = 0 ; k < numElems ; k++)
for (size_t k = 0 ; k < numElems ; k++)
{
setList.push_back(ns->GetElement(k));
}
......@@ -608,7 +603,7 @@ avtSILRestrictionTraverser::GetDomainList(vector<int> &list, bool allProcs)
//
sort(list_with_repeats.begin(), list_with_repeats.end());
int last = -1; // -1 is guaranteed to be different than l_w_r[0].
for (i = 0 ; i < list_with_repeats.size() ; i++)
for (size_t i = 0 ; i < list_with_repeats.size() ; i++)
{
if (list_with_repeats[i] != last)
{
......@@ -772,15 +767,13 @@ avtSILRestrictionTraverser::UsesAllDomains(void)
{
int timingsHandle = visitTimer->StartTimer();
size_t i;
//
// Find the domains map coming out of the top level set.
//
avtSILSet_p set = silr->GetSILSet(silr->topSet);
const vector<int> &mapsOut = set->GetMapsOut();
avtSILCollection_p domainCollection = NULL;
for (i = 0 ; i < mapsOut.size() ; i++)
for (size_t i = 0 ; i < mapsOut.size() ; i++)
{
avtSILCollection_p coll = silr->GetSILCollection(mapsOut[i]);
if (coll->GetRole() == SIL_DOMAIN)
......@@ -817,7 +810,7 @@ avtSILRestrictionTraverser::UsesAllDomains(void)
//
const vector<unsigned char> &useSet = silr->useSet;
bool retval = true;
for (i = 0 ; i < nTargetDomains ; i++)
for (size_t i = 0 ; i < nTargetDomains ; i++)
{
if (useSet[domainCollection->GetSubset(i)] == NoneUsed)
{
......@@ -1193,7 +1186,6 @@ avtSILRestrictionTraverser::UsesAllMaterials()
return true;
}
size_t i, j;
avtSILSet_p set = silr->GetSILSet(silr->topSet);
const vector<int> &mapsOut = set->GetMapsOut();
......@@ -1202,7 +1194,7 @@ avtSILRestrictionTraverser::UsesAllMaterials()
//
const vector<unsigned char> &useSet = silr->useSet;
bool allUsed = true;
for (i = 0 ; i < mapsOut.size() && allUsed; i++)
for (size_t i = 0 ; i < mapsOut.size() && allUsed; i++)
{
avtSILCollection_p coll = silr->GetSILCollection(mapsOut[i]);
if (coll->GetRole() == SIL_MATERIAL)
......@@ -1212,7 +1204,7 @@ avtSILRestrictionTraverser::UsesAllMaterials()
// of the material subsets and determine if it is on or off.
//
size_t numElems = coll->GetNumberOfSubsets();
for (j = 0 ; j < numElems && allUsed; j++)
for (size_t j = 0 ; j < numElems && allUsed; j++)
{
allUsed = (useSet[coll->GetSubset(j)] != NoneUsed);
}
......
......@@ -195,8 +195,6 @@ avtDataBinningConstructor::ConstructDataBinning(
ConstructDataBinningAttributes *atts,
avtContract_p spec, bool mustReExecute)
{
size_t i, j, k, l;
//
// Certify the attributes.
//
......@@ -212,7 +210,7 @@ avtDataBinningConstructor::ConstructDataBinning(
EXCEPTION1(ImproperUseException, "The reduction operator requires a variable.");
return NULL;
}
for (i = 0 ; i < atts->GetVarnames().size() ; i++)
for (size_t i = 0 ; i < atts->GetVarnames().size() ; i++)
{
if (atts->GetVarnames()[i] == "")
{
......@@ -237,7 +235,7 @@ avtDataBinningConstructor::ConstructDataBinning(
// case, the binType should be assumed to be all "Variable". Make an
// array following this assumption, so coding below can be a bit easier.
int *binType = new int[atts->GetNumBins().size()];
for (i = 0 ; i < atts->GetNumBins().size() ; i++)
for (size_t i = 0 ; i < atts->GetNumBins().size() ; i++)
{
if (atts->GetBinType().size() == 0)
binType[i] = ConstructDataBinningAttributes::Variable;
......@@ -263,7 +261,7 @@ avtDataBinningConstructor::ConstructDataBinning(
"every variable. The range is the wrong size.");
return NULL;
}
for (i = 0 ; i < atts->GetVarnames().size() ; i++)
for (size_t i = 0 ; i < atts->GetVarnames().size() ; i++)
{
if (atts->GetBinBoundaries()[2*i] >= atts->GetBinBoundaries()[2*i+1])
{
......@@ -275,7 +273,7 @@ avtDataBinningConstructor::ConstructDataBinning(
return NULL;
}
}
for (i = 0 ; i < atts->GetVarnames().size() ; i++)
for (size_t i = 0 ; i < atts->GetVarnames().size() ; i++)
{
if (atts->GetNumBins()[i] <= 0)
{
......@@ -293,10 +291,10 @@ avtDataBinningConstructor::ConstructDataBinning(
//
int nvars = atts->GetVarnames().size();
float *minmax = new float[2*nvars];
for (i = 0 ; i < (size_t)2*nvars ; i++)
for (size_t i = 0 ; i < (size_t)2*nvars ; i++)
minmax[i] = atts->GetBinBoundaries()[i];
int *nvals = new int[nvars];
for (i = 0 ; i < (size_t)nvars ; i++)
for (size_t i = 0 ; i < (size_t)nvars ; i++)
nvals[i] = atts->GetNumBins()[i];
avtBinningScheme *bs = new avtUniformBinningScheme(nvars, minmax, nvals);
std::vector<std::string> varnames = atts->GetVarnames();
......@@ -377,7 +375,7 @@ avtDataBinningConstructor::ConstructDataBinning(
avtDataRequest_p dataRequest = spec2->GetDataRequest();
if (atts->GetVarForReductionOperator() != "")
dataRequest->AddSecondaryVariable(atts->GetVarForReductionOperator().c_str());
for (i = 0 ; i < atts->GetVarnames().size() ; i++)
for (size_t i = 0 ; i < atts->GetVarnames().size() ; i++)
if (binType[i] == ConstructDataBinningAttributes::Variable)
dataRequest->AddSecondaryVariable(atts->GetVarnames()[i].c_str());
dataRequest->SetTimestep(time);
......@@ -408,7 +406,7 @@ avtDataBinningConstructor::ConstructDataBinning(
bool mixedCentering = false;
if (nLeaves > 0)
{
for (k = 0 ; k < (size_t)nvars ; k++)
for (size_t k = 0 ; k < (size_t)nvars ; k++)
{
avtDataBinningFunctionInfo::BinBasedOn bbo =
info->GetBinBasedOnType(k);
......@@ -441,14 +439,14 @@ avtDataBinningConstructor::ConstructDataBinning(
else
hasError = true;
for (k = 0 ; k < (size_t)nvars ; k++)
for (size_t k = 0 ; k < (size_t)nvars ; k++)
if (isNodal[k] != coDomIsNodal)
mixedCentering = true;
}
else
{
// still should check for mixed centering
for (k = 1 ; k < (size_t)nvars ; k++)
for (size_t k = 1 ; k < (size_t)nvars ; k++)
if (isNodal[k] != isNodal[0])
mixedCentering = true;
}
......@@ -474,15 +472,15 @@ avtDataBinningConstructor::ConstructDataBinning(
}
ValueRetriever **val_ret = new ValueRetriever*[nvars];
for (k = 0 ; k < (size_t)nvars ; k++)
for (size_t k = 0 ; k < (size_t)nvars ; k++)
val_ret[k] = NULL;
float *args = new float[nvars];
for (j = 0 ; j < (size_t)nLeaves ; j++)
for (size_t j = 0 ; j < (size_t)nLeaves ; j++)
{
vtkDataArray *codomain = (coDomIsNodal
? leaves[j]->GetPointData()->GetArray(codomain_varname)
: leaves[j]->GetCellData()->GetArray(codomain_varname));
for (k = 0 ; k < (size_t)nvars ; k++)
for (size_t k = 0 ; k < (size_t)nvars ; k++)
{
avtDataBinningFunctionInfo::BinBasedOn bbo =
info->GetBinBasedOnType(k);
......@@ -531,7 +529,7 @@ avtDataBinningConstructor::ConstructDataBinning(
{
useValue.resize(nvals, false);
size_t ncells = leaves[j]->GetNumberOfCells();
for (l = 0 ; l < ncells ; l++)
for (size_t l = 0 ; l < ncells ; l++)
{
vtkCell *cell = leaves[j]->GetCell(l);
for (int p = 0 ; p < cell->GetNumberOfPoints() ; p++)
......@@ -543,7 +541,7 @@ avtDataBinningConstructor::ConstructDataBinning(
}