Commit 6e5da5aa authored by bonnell's avatar bonnell

Remove warnings:

1) added #pragma warning(disable:4251) to slivr to remove dll-interface warnings (removed 386 warnings on Windows)

'size_t' to 'int' conversions (mostly when using .size() of an stl containter)

2) 'return' : conversion from 'size_t' to 'int' (cast return to 'int')
3) Change use of 'int' to 'size_t' when 'size_t' is more appropriate.
4) Change use 'size_t' to 'int' when 'int' is more appropriate
5) Cast arguments to functions from 'size_t' to 'int' when 'int' is expected.
6) use 'vtkIdType' when calling vtkDataArry->GetNumberOfTuples()
7) use 'int' when calling vtkDataArray->GetNumberOfComponents()

Reduced warnings on Windows from 6633 down to 4900.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21610 18c085ea-50e0-402c-830e-de6fd14e8384
parent f34b407a
......@@ -6474,13 +6474,11 @@ avtDatabaseMetaData::IssueWarning(const char *msg)
bool
avtDatabaseMetaData::VarIsCompound(const std::string &v) const
{
int beg = -1, end = -1;
// find the mesh name enclosed in parentheses
beg = v.find('(');
end = v.find(')');
size_t beg = v.find('(');
size_t end = v.find(')');
if (beg == -1 || end == -1)
if (beg == std::string::npos || end == std::string::npos)
{
return false;
}
......@@ -6563,13 +6561,11 @@ void
avtDatabaseMetaData::ParseCompoundForMesh(const std::string &inVar,
std::string &outVar) const
{
int beg = -1, end = -1;
// find the mesh name enclosed in parentheses
beg = inVar.find('(');
end = inVar.find(')');
size_t beg = inVar.find('(');
size_t end = inVar.find(')');
if (beg == -1 || end == -1)
if (beg == std::string::npos || end == std::string::npos)
{
// this is not a parseable variable.
outVar = inVar;
......@@ -6605,13 +6601,11 @@ void
avtDatabaseMetaData::ParseCompoundForCategory(const std::string &inVar,
std::string &outVar) const
{
int end = -1, beg = -1;
// find the mesh name enclosed in parentheses
beg = inVar.find('(');
end = inVar.find(')');
size_t beg = inVar.find('(');
size_t end = inVar.find(')');
if (beg == -1 || end == -1)
if (beg == std::string::npos || end == std::string::npos)
{
// this is not a compound variable.
outVar = inVar;
......
......@@ -1038,7 +1038,7 @@ avtScalarMetaData::ComboValFromDigits(const std::vector<std::vector<int> > &ptMa
int row, col;
*id = 0.0;
std::list<int>::const_reverse_iterator it;
for (col = digits.size()-1, it = digits.rbegin(); col >= 0; col--, it++)
for (col = (int)digits.size()-1, it = digits.rbegin(); col >= 0; col--, it++)
{
for (row = 0; row <= *it; row++)
*id += ptMap[row][col];
......
......@@ -1229,7 +1229,7 @@ avtSIL::MakeSILAttributes(void) const
//
// Add the sets.
//
size_t nSets = sets.size();
int nSets = (int)sets.size();
rv->SetNSets(nSets);
vector<string> names;
vector<int> ids;
......@@ -1245,7 +1245,7 @@ avtSIL::MakeSILAttributes(void) const
//
// Add the collections.
//
size_t nCols = collections.size();
int nCols = (int)collections.size();
rv->SetNCollections(nCols);
vector<string> cats;
vector<int> roles;
......
......@@ -110,9 +110,9 @@ avtDataBinningFunctionInfo::~avtDataBinningFunctionInfo()
const std::string &
avtDataBinningFunctionInfo::GetDomainTupleName(int idx) const
{
if (idx < 0 || idx >= tupleNames.size())
if (idx < 0 || idx >= (int)tupleNames.size())
{
EXCEPTION2(BadIndexException, idx, tupleNames.size());
EXCEPTION2(BadIndexException, idx, (int)tupleNames.size());
}
return tupleNames[idx];
......@@ -137,9 +137,9 @@ avtDataBinningFunctionInfo::GetBinBasedOnType(int idx) const
if (binBasedOn.size() == 0)
return VARIABLE;
if (idx < 0 || idx >= binBasedOn.size())
if (idx < 0 || idx >= (int)binBasedOn.size())
{
EXCEPTION2(BadIndexException, idx, binBasedOn.size());
EXCEPTION2(BadIndexException, idx, (int)binBasedOn.size());
}
return binBasedOn[idx];
......
......@@ -94,7 +94,7 @@ class AVTDBIN_API avtDataBinningFunctionInfo
virtual ~avtDataBinningFunctionInfo();
int GetDomainNumberOfTuples(void) const
{ return tupleNames.size(); };
{ return (int)tupleNames.size(); };
const std::string &GetDomainTupleName(int) const;
BinBasedOn GetBinBasedOnType(int) const;
const std::string &GetCodomainName(void) const
......
......@@ -226,9 +226,9 @@ avtFileDescriptorManager::RegisterFile(CloseFileCallback cback, void *args)
void
avtFileDescriptorManager::UnregisterFile(int index)
{
if (index >= fileIsOpen.size() || index < 0)
if (index >= (int)fileIsOpen.size() || index < 0)
{
EXCEPTION2(BadIndexException, index, fileIsOpen.size());
EXCEPTION2(BadIndexException, index, (int)fileIsOpen.size());
}
if (!fileIsOpen[index])
......@@ -260,9 +260,9 @@ avtFileDescriptorManager::UnregisterFile(int index)
void
avtFileDescriptorManager::UsedFile(int index)
{
if (index >= fileIsOpen.size() || index < 0)
if (index >= (int)fileIsOpen.size() || index < 0)
{
EXCEPTION2(BadIndexException, index, fileIsOpen.size());
EXCEPTION2(BadIndexException, index, (int)fileIsOpen.size());
}
VisitMutexLock("avtFileDescriptorManagerFileTimestamp");
......
......@@ -298,8 +298,8 @@ ConvertDataArrayToFloat(vtkDataArray *oldArr)
{
newArr = vtkFloatArray::New();
size_t numTuples = oldArr->GetNumberOfTuples();
size_t numComponents = oldArr->GetNumberOfComponents();
vtkIdType numTuples = oldArr->GetNumberOfTuples();
int numComponents = oldArr->GetNumberOfComponents();
newArr->SetNumberOfComponents(numComponents);
newArr->SetNumberOfTuples(numTuples);
......@@ -402,8 +402,8 @@ ConvertDataArrayToDouble(vtkDataArray *oldArr)
{
newArr = vtkDoubleArray::New();
size_t numTuples = oldArr->GetNumberOfTuples();
size_t numComponents = oldArr->GetNumberOfComponents();
vtkIdType numTuples = oldArr->GetNumberOfTuples();
int numComponents = oldArr->GetNumberOfComponents();
newArr->SetNumberOfComponents(numComponents);
newArr->SetNumberOfTuples(numTuples);
......
......@@ -704,15 +704,15 @@ int
avtMTMDFileFormatInterface::GetTimestepGroupForTimestep(int ts)
{
int group = 0;
while (group < tsPerGroup.size() &&
while (group < (int)tsPerGroup.size() &&
tsPerGroup[group] <= ts)
{
ts -= tsPerGroup[group];
++group;
}
if (group >= tsPerGroup.size())
if (group >= (int)tsPerGroup.size())
{
EXCEPTION2(BadIndexException, group, tsPerGroup.size());
EXCEPTION2(BadIndexException, group, (int)tsPerGroup.size());
}
return group;
}
......
......@@ -884,15 +884,15 @@ int
avtMTSDFileFormatInterface::GetTimestepGroupForTimestep(int ts)
{
int group = 0;
while (group < tsPerGroup.size() &&
while (group < (int)tsPerGroup.size() &&
tsPerGroup[group] <= ts)
{
ts -= tsPerGroup[group];
++group;
}
if (group >= tsPerGroup.size())
if (group >= (int)tsPerGroup.size())
{
EXCEPTION2(BadIndexException, group, tsPerGroup.size());
EXCEPTION2(BadIndexException, group, (int)tsPerGroup.size());
}
return group;
}
......
......@@ -273,7 +273,7 @@ Boundary::DeleteNeighbor(int d, std::vector<Boundary> &wholelist)
std::vector<int> delete_list;
for (size_t i=0; i<neighbors.size(); i++)
if (neighbors[i].domain == d)
delete_list.push_back(i);
delete_list.push_back((int)i);
if (delete_list.size() == 0)
{
......
......@@ -225,7 +225,7 @@ DetectBoundaryGhostLayers(int numDims, unsigned char *ghostData, int numCells,
if (ghostCases.size() != 3)
{
EXCEPTION2(UnexpectedValueException, 3, ghostCases.size());
EXCEPTION2(UnexpectedValueException, 3, (int)ghostCases.size());
}
ghostLayers[0] = ghostCases[0];
......@@ -703,10 +703,10 @@ avtStructuredDomainNesting::ConfirmMesh(vector<int> &domains,
vector<int>
avtStructuredDomainNesting::GetRatiosForLevel(int level, int dom)
{
if (level < 0 || level >= levelRatios.size())
EXCEPTION2(BadIndexException, level, levelRatios.size());
if (level < 0 || level >= (int)levelRatios.size())
EXCEPTION2(BadIndexException, level, (int)levelRatios.size());
if (dom < 0 || dom >= domainNesting.size())
EXCEPTION2(BadIndexException, dom, domainNesting.size());
EXCEPTION2(BadIndexException, dom, (int)domainNesting.size());
int myLevel = domainNesting[dom].level;
vector<int> rv;
......@@ -773,9 +773,9 @@ void
avtStructuredDomainNesting::GetNestingForDomain(int domain,
vector<int> &exts, vector<int> &children, vector<int> &childExts)
{
if (domain < 0 || domain >= domainNesting.size())
if (domain < 0 || domain >= (int)domainNesting.size())
{
EXCEPTION2(BadIndexException, domain, domainNesting.size());
EXCEPTION2(BadIndexException, domain, (int)domainNesting.size());
}
avtNestedDomainInfo_t &info = domainNesting[domain];
......@@ -818,9 +818,9 @@ avtStructuredDomainNesting::GetChildrenForLogicalIndex(int domain, int ijk[3],
vector<int> &children,
vector<int> &chExts)
{
if (domain < 0 || domain >= domainNesting.size())
if (domain < 0 || domain >= (int)domainNesting.size())
{
EXCEPTION2(BadIndexException, domain, domainNesting.size());
EXCEPTION2(BadIndexException, domain, (int)domainNesting.size());
}
if ((domainNesting[domain].logicalExtents[0] > ijk[0]) ||
......@@ -896,9 +896,9 @@ avtStructuredDomainNesting::GetChildrenForLogicalRange(int domain, int ijk[6],
vector<int> &children,
vector<int> &chExts)
{
if (domain < 0 || domain >= domainNesting.size())
if (domain < 0 || domain >= (int)domainNesting.size())
{
EXCEPTION2(BadIndexException, domain, domainNesting.size());
EXCEPTION2(BadIndexException, domain, (int)domainNesting.size());
}
if(domainNesting[domain].childDomains.size() == 0)
......@@ -907,7 +907,7 @@ avtStructuredDomainNesting::GetChildrenForLogicalRange(int domain, int ijk[6],
int child_ext[6];
vector<int> ratios;
for(unsigned int i=0; i<domainNesting[domain].childDomains.size(); i++)
for(size_t i=0; i<domainNesting[domain].childDomains.size(); i++)
{
ratios = GetRatiosForLevel(domainNesting[domain].level,
domainNesting[domain].childDomains[i]);
......@@ -950,9 +950,9 @@ avtStructuredDomainNesting::GetChildrenForLogicalRange(int domain, int ijk[6],
// ****************************************************************************
int avtStructuredDomainNesting::GetDomainLevel(int domain)
{
if (domain < 0 || domain >= domainNesting.size())
if (domain < 0 || domain >= (int)domainNesting.size())
{
EXCEPTION2(BadIndexException, domain, domainNesting.size());
EXCEPTION2(BadIndexException, domain, (int)domainNesting.size());
}
return domainNesting[domain].level;
......@@ -973,9 +973,9 @@ int avtStructuredDomainNesting::GetDomainLevel(int domain)
// ****************************************************************************
vector<int> avtStructuredDomainNesting::GetDomainLogicalExtents(int domain)
{
if (domain < 0 || domain >= domainNesting.size())
if (domain < 0 || domain >= (int)domainNesting.size())
{
EXCEPTION2(BadIndexException, domain, domainNesting.size());
EXCEPTION2(BadIndexException, domain, (int)domainNesting.size());
}
return domainNesting[domain].logicalExtents;
......@@ -996,9 +996,9 @@ vector<int> avtStructuredDomainNesting::GetDomainLogicalExtents(int domain)
// ****************************************************************************
vector<int> avtStructuredDomainNesting::GetDomainChildren(int domain)
{
if (domain < 0 || domain >= domainNesting.size())
if (domain < 0 || domain >= (int)domainNesting.size())
{
EXCEPTION2(BadIndexException, domain, domainNesting.size());
EXCEPTION2(BadIndexException, domain, (int)domainNesting.size());
}
return domainNesting[domain].childDomains;
......@@ -1019,9 +1019,9 @@ vector<int> avtStructuredDomainNesting::GetDomainChildren(int domain)
// ****************************************************************************
int avtStructuredDomainNesting::GetNumberOfChildren(int domain)
{
if (domain < 0 || domain >= domainNesting.size())
if (domain < 0 || domain >= (int)domainNesting.size())
{
EXCEPTION2(BadIndexException, domain, domainNesting.size());
EXCEPTION2(BadIndexException, domain, (int)domainNesting.size());
}
return domainNesting[domain].childDomains.size();
......@@ -1057,9 +1057,9 @@ size_t avtStructuredDomainNesting::GetNumberOfDomains() const
// ****************************************************************************
void avtStructuredDomainNesting::ComputeChildBoundingBox(int domain)
{
if (domain < 0 || domain >= domainNesting.size())
if (domain < 0 || domain >= (int)domainNesting.size())
{
EXCEPTION2(BadIndexException, domain, domainNesting.size());
EXCEPTION2(BadIndexException, domain, (int)domainNesting.size());
}
domainNesting[domain].childBoundingBox[0] = -1;
......@@ -1139,9 +1139,9 @@ void avtStructuredDomainNesting::ComputeChildBoundingBox(int domain)
// ****************************************************************************
bool avtStructuredDomainNesting::InsideChildBoundingBox(int domain, int ijk[6])
{
if (domain < 0 || domain >= domainNesting.size())
if (domain < 0 || domain >= (int)domainNesting.size())
{
EXCEPTION2(BadIndexException, domain, domainNesting.size());
EXCEPTION2(BadIndexException, domain, (int)domainNesting.size());
}
if(domainNesting[domain].childDomains.size() == 0)
......
......@@ -100,8 +100,8 @@ avtMacroExpressionFilter::ProcessArguments(ArgsExpr *args,
ExprPipelineState *state)
{
std::vector<ArgExpr*> *arguments = args->GetArgs();
int nArgs = arguments->size();
for (int i = 0 ; i < nArgs ; i++)
size_t nArgs = arguments->size();
for (size_t i = 0 ; i < nArgs ; i++)
{
expression_arguments.push_back((*arguments)[i]->GetText());
}
......
......@@ -218,8 +218,8 @@ avtCurveCMFEExpression::HasDupX(vtkRectilinearGrid *rgrid)
vtkRectilinearGrid *
avtCurveCMFEExpression::RemoveDuplicateX(vtkRectilinearGrid *rgrid)
{
size_t i, j, k, nDups = 1;
size_t ny = rgrid->GetPointData()->GetNumberOfArrays();
int i, j, k, nDups = 1;
int ny = rgrid->GetPointData()->GetNumberOfArrays();
double *sum = new double[ny];
vtkDataArray **y = new vtkDataArray*[ny];
vtkDataArray **Y = new vtkDataArray*[ny];
......@@ -239,7 +239,7 @@ avtCurveCMFEExpression::RemoveDuplicateX(vtkRectilinearGrid *rgrid)
X->SetNumberOfComponents(1);
X->Allocate(x->GetNumberOfTuples());
size_t n = x->GetNumberOfTuples();
vtkIdType n = x->GetNumberOfTuples();
for (i = 0; i < n; i+= nDups)
{
if (i < n-1)
......@@ -393,7 +393,7 @@ avtCurveCMFEExpression::MergeCurvesToSameXIntervals(vtkRectilinearGrid *in_r1,
unique_x.push_back(all_xs[i]);
}
delete [] all_xs;
total_n_pts = unique_x.size();
total_n_pts = (int)unique_x.size();
// Grab current arrays and set up new arrays for curve1
int ny1 = r1->GetPointData()->GetNumberOfArrays();
......
......@@ -252,7 +252,7 @@ avtPosCMFEAlgorithm::PerformCMFE(avtDataTree_p output_mesh,
//
int t2 = visitTimer->StartTimer();
avtDataTree_p *leaves = new avtDataTree_p[output_list.datasets.size()];
for (size_t i = 0 ; i < output_list.datasets.size() ; i++)
for (int i = 0 ; i < (int)output_list.datasets.size() ; i++)
{
vtkDataSet *in_ds1 = output_list.datasets[i];
vtkDataArray *defaultVar = NULL;
......@@ -309,7 +309,7 @@ avtPosCMFEAlgorithm::PerformCMFE(avtDataTree_p output_mesh,
}
avtDataTree_p rv;
if (output_list.datasets.size() > 0)
rv = new avtDataTree(output_list.datasets.size(), leaves);
rv = new avtDataTree((int)output_list.datasets.size(), leaves);
else
rv = new avtDataTree();
delete [] leaves;
......@@ -1440,7 +1440,7 @@ avtPosCMFEAlgorithm::FastLookupGrouping::Finalize(void)
cell->GetBounds(bounds);
itree->AddElement(index, bounds);
map_to_ds[index] = i;
map_to_ds[index] = (int)i;
index++;
}
}
......
......@@ -121,11 +121,11 @@ avtArrayComposeExpression::DeriveVariable(vtkDataSet *in_ds, int currentDomainsI
if (varnames.size() == 0)
EXCEPTION0(ImproperUseException);
size_t nvars = varnames.size();
int nvars = (int)varnames.size();
vtkDataArray **vars = new vtkDataArray*[nvars];
avtCentering *centering = new avtCentering[nvars];
for (size_t i = 0 ; i < nvars ; i++)
for (int i = 0 ; i < nvars ; i++)
{
vars[i] = in_ds->GetPointData()->GetArray(varnames[i]);
centering[i] = AVT_NODECENT;
......@@ -137,7 +137,7 @@ avtArrayComposeExpression::DeriveVariable(vtkDataSet *in_ds, int currentDomainsI
}
int outType = VTK_FLOAT;
for (size_t i = 0 ; i < nvars ; i++)
for (int i = 0 ; i < nvars ; i++)
{
if (vars[i] == NULL)
EXCEPTION2(ExpressionException, outputVariableName,
......@@ -158,7 +158,7 @@ avtArrayComposeExpression::DeriveVariable(vtkDataSet *in_ds, int currentDomainsI
vtkIdType nvals = vars[0]->GetNumberOfTuples();
rv->SetNumberOfTuples(nvals);
for (vtkIdType i = 0 ; i < nvals ; i++)
for (size_t j = 0 ; j < nvars ; j++)
for (int j = 0 ; j < nvars ; j++)
rv->SetComponent(i, j, vars[j]->GetTuple1(i));
delete [] vars;
......@@ -191,7 +191,7 @@ avtArrayComposeExpression::ProcessArguments(ArgsExpr *args,
{
// Check the number of arguments
std::vector<ArgExpr*> *arguments = args->GetArgs();
nargs = arguments->size();
nargs = (int)arguments->size();
// Let the base class do this processing. We only had to over-ride this
// function to determine the number of arguments.
......@@ -226,11 +226,11 @@ avtArrayComposeExpression::UpdateDataObjectInfo(void)
return;
std::vector<std::string> subnames(varnames.size());
for (int i = 0 ; i < varnames.size() ; i++)
for (size_t i = 0 ; i < varnames.size() ; i++)
subnames[i] = varnames[i];
avtDataAttributes &outAtts = GetOutput()->GetInfo().GetAttributes();
outAtts.SetVariableDimension(varnames.size(), outputVariableName);
outAtts.SetVariableDimension((int)varnames.size(), outputVariableName);
outAtts.SetVariableSubnames(subnames, outputVariableName);
}
......@@ -117,11 +117,11 @@ avtArrayComposeWithBinsExpression::DeriveVariable(vtkDataSet *in_ds, int current
if (varnames.size() == 0)
EXCEPTION0(ImproperUseException);
size_t nvars = varnames.size();
int nvars = (int)varnames.size();
vtkDataArray **vars = new vtkDataArray*[nvars];
avtCentering *centering = new avtCentering[nvars];
for (size_t i = 0 ; i < nvars ; i++)
for (int i = 0 ; i < nvars ; i++)
{
vars[i] = in_ds->GetPointData()->GetArray(varnames[i]);
centering[i] = AVT_NODECENT;
......@@ -133,7 +133,7 @@ avtArrayComposeWithBinsExpression::DeriveVariable(vtkDataSet *in_ds, int current
}
int outType = VTK_FLOAT;
for (size_t i = 0 ; i < nvars ; i++)
for (int i = 0 ; i < nvars ; i++)
{
if (vars[i] == NULL)
EXCEPTION2(ExpressionException, outputVariableName,
......@@ -154,7 +154,7 @@ avtArrayComposeWithBinsExpression::DeriveVariable(vtkDataSet *in_ds, int current
vtkIdType nvals = vars[0]->GetNumberOfTuples();
rv->SetNumberOfTuples(nvals);
for (vtkIdType i = 0 ; i < nvals ; i++)
for (size_t j = 0 ; j < nvars ; j++)
for (int j = 0 ; j < nvars ; j++)
rv->SetComponent(i, j, vars[j]->GetTuple1(i));
delete [] vars;
......@@ -187,7 +187,7 @@ avtArrayComposeWithBinsExpression::ProcessArguments(ArgsExpr *args,
{
// Check the number of arguments
std::vector<ArgExpr*> *arguments = args->GetArgs();
nvars = arguments->size()-1;
nvars = (int)arguments->size()-1;
int idx_of_list = arguments->size()-1;
ArgExpr *listarg = (*arguments)[idx_of_list];
......@@ -274,11 +274,11 @@ avtArrayComposeWithBinsExpression::UpdateDataObjectInfo(void)
return;
std::vector<std::string> subnames(varnames.size());
for (int i = 0 ; i < varnames.size() ; i++)
for (size_t i = 0 ; i < varnames.size() ; i++)
subnames[i] = varnames[i];
avtDataAttributes &outAtts = GetOutput()->GetInfo().GetAttributes();
outAtts.SetVariableDimension(varnames.size(), outputVariableName);
outAtts.SetVariableDimension((int)varnames.size(), outputVariableName);
outAtts.SetVariableSubnames(subnames, outputVariableName);
outAtts.SetVariableBinRanges(binRanges, outputVariableName);
}
......
......@@ -2046,7 +2046,7 @@ avtConnComponentsExpression::BoundarySet::GetIntersectionSet(
ub[2] = isect_bounds[5];
src_itree->GetElementsListFromRange(lb,ub,src_isect_cells);
nsrc_isect_cells = src_isect_cells.size();
nsrc_isect_cells = (int)src_isect_cells.size();
// if there are no source cells in this range, we are done
if (nsrc_isect_cells == 0)
......@@ -2072,7 +2072,7 @@ avtConnComponentsExpression::BoundarySet::GetIntersectionSet(
ub[2] = src_cell_bounds[5];
can_itree->GetElementsListFromRange(lb,ub,can_isect_cells);
ncan_isect_cells = can_isect_cells.size();
ncan_isect_cells = (int)can_isect_cells.size();
// if there are no source cells in this range, check next source cell
if (ncan_isect_cells == 0)
continue;
......
......@@ -236,7 +236,7 @@ avtGeodesicVectorQuantizeExpression::ProcessArguments(ArgsExpr *args,
{
// Check the number of arguments
std::vector<ArgExpr*> *arguments = args->GetArgs();
nargs = arguments->size();
nargs = (int)arguments->size();
if (nargs > 2)
EXCEPTION2(ExpressionException, outputVariableName,
......@@ -304,7 +304,7 @@ avtGeodesicVectorQuantizeExpression::UpdateDataObjectInfo(void)
}
avtDataAttributes &outAtts = GetOutput()->GetInfo().GetAttributes();
outAtts.SetVariableDimension(subnames.size(), outputVariableName);
outAtts.SetVariableDimension((int)subnames.size(), outputVariableName);
outAtts.SetVariableSubnames(subnames, outputVariableName);
}
......@@ -334,7 +334,7 @@ avtExpressionEvaluatorFilter::VerifyVariableTypes(void)
int
avtExpressionEvaluatorFilter::AdditionalPipelineFilters(void)
{
return pipelineState.GetFilters().size();
return (int)pipelineState.GetFilters().size();
}
......@@ -418,7 +418,6 @@ avtContract_p
avtExpressionEvaluatorFilter::ModifyContract(avtContract_p spec)
{
pipelineState.Clear();
int i;
avtContract_p rv = spec;
......@@ -452,7 +451,7 @@ avtExpressionEvaluatorFilter::ModifyContract(avtContract_p spec)
// Insert all of the variables onto the candidates list.
candidates.insert(ds->GetVariable());
const vector<CharStrRef> &sv = ds->GetSecondaryVariables();
for (i = 0; i != sv.size(); i++)
for (size_t i = 0; i != sv.size(); i++)
{
const char *str = *(sv[i]);