Commit f34b407a authored by bonnell's avatar bonnell
Browse files

Update atts generator to cast to 'int' the return value of GetNum* method, regenerated atts

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21609 18c085ea-50e0-402c-830e-de6fd14e8384
parent 497b17b3
......@@ -673,7 +673,7 @@ AnnotationObjectList::RemoveAnnotation(int index)
int
AnnotationObjectList::GetNumAnnotations() const
{
return annotation.size();
return (int)annotation.size();
}
// ****************************************************************************
......
......@@ -573,7 +573,7 @@ ClientInformationList::RemoveClients(int index)
int
ClientInformationList::GetNumClients() const
{
return clients.size();
return (int)clients.size();
}
// ****************************************************************************
......
......@@ -672,7 +672,7 @@ ColorAttributeList::RemoveColors(int index)
int
ColorAttributeList::GetNumColors() const
{
return colors.size();
return (int)colors.size();
}
// ****************************************************************************
......
......@@ -857,7 +857,7 @@ ColorControlPointList::RemoveControlPoints(int index)
int
ColorControlPointList::GetNumControlPoints() const
{
return controlPoints.size();
return (int)controlPoints.size();
}
// ****************************************************************************
......@@ -1130,10 +1130,8 @@ ColorControlPointList::FieldsEqual(int index_, const AttributeGroup *rhs) const
float
ColorControlPointList::EvalCubicSpline(float t, const float *allX, const float *allY, int n) const
{
if(t <= allX[0])
return allY[0];
if(t >= allX[n-1])
return allY[n-1];
if((allX[0] > t) || (allX[n-1] < t))
return 0.f;
int i = 0;
for(i = 0; i < n; ++i)
if(allX[i] >= t)
......
......@@ -875,7 +875,7 @@ ColorTableAttributes::RemoveColorTables(int index)
int
ColorTableAttributes::GetNumColorTables() const
{
return colorTables.size();
return (int)colorTables.size();
}
// ****************************************************************************
......
......@@ -908,7 +908,7 @@ DBPluginInfoAttributes::RemoveDbReadOptions(int index)
int
DBPluginInfoAttributes::GetNumDbReadOptions() const
{
return dbReadOptions.size();
return (int)dbReadOptions.size();
}
// ****************************************************************************
......@@ -1059,7 +1059,7 @@ DBPluginInfoAttributes::RemoveDbWriteOptions(int index)
int
DBPluginInfoAttributes::GetNumDbWriteOptions() const
{
return dbWriteOptions.size();
return (int)dbWriteOptions.size();
}
// ****************************************************************************
......
......@@ -780,7 +780,7 @@ DatabaseCorrelationList::RemoveCorrelations(int index)
int
DatabaseCorrelationList::GetNumCorrelations() const
{
return correlations.size();
return (int)correlations.size();
}
// ****************************************************************************
......
......@@ -745,7 +745,7 @@ EngineList::RemoveProperties(int index)
int
EngineList::GetNumProperties() const
{
return properties.size();
return (int)properties.size();
}
// ****************************************************************************
......
......@@ -678,7 +678,7 @@ ExpressionList::RemoveExpressions(int index)
int
ExpressionList::GetNumExpressions() const
{
return expressions.size();
return (int)expressions.size();
}
// ****************************************************************************
......
......@@ -818,7 +818,7 @@ FileOpenOptions::RemoveOpenOptions(int index)
int
FileOpenOptions::GetNumOpenOptions() const
{
return openOptions.size();
return (int)openOptions.size();
}
// ****************************************************************************
......
......@@ -672,7 +672,7 @@ GaussianControlPointList::RemoveControlPoints(int index)
int
GaussianControlPointList::GetNumControlPoints() const
{
return controlPoints.size();
return (int)controlPoints.size();
}
// ****************************************************************************
......
......@@ -672,7 +672,7 @@ HostProfileList::RemoveMachines(int index)
int
HostProfileList::GetNumMachines() const
{
return machines.size();
return (int)machines.size();
}
// ****************************************************************************
......
......@@ -1339,7 +1339,7 @@ MachineProfile::RemoveLaunchProfiles(int index)
int
MachineProfile::GetNumLaunchProfiles() const
{
return launchProfiles.size();
return (int)launchProfiles.size();
}
// ****************************************************************************
......
......@@ -2554,7 +2554,7 @@ PickAttributes::RemoveVarInfo(int index)
int
PickAttributes::GetNumVarInfos() const
{
return varInfo.size();
return (int)varInfo.size();
}
// ****************************************************************************
......
......@@ -672,7 +672,7 @@ PlotList::RemovePlots(int index)
int
PlotList::GetNumPlots() const
{
return plots.size();
return (int)plots.size();
}
// ****************************************************************************
......
......@@ -1147,7 +1147,7 @@ SILAttributes::RemoveNspace(int index)
int
SILAttributes::GetNumNspaces() const
{
return nspace.size();
return (int)nspace.size();
}
// ****************************************************************************
......@@ -1298,7 +1298,7 @@ SILAttributes::RemoveMatrices(int index)
int
SILAttributes::GetNumMatrices() const
{
return matrices.size();
return (int)matrices.size();
}
// ****************************************************************************
......@@ -1449,7 +1449,7 @@ SILAttributes::RemoveArrays(int index)
int
SILAttributes::GetNumArrays() const
{
return arrays.size();
return (int)arrays.size();
}
// ****************************************************************************
......
......@@ -760,7 +760,7 @@ SelectionList::RemoveSelections(int index)
int
SelectionList::GetNumSelections() const
{
return selections.size();
return (int)selections.size();
}
// ****************************************************************************
......@@ -911,7 +911,7 @@ SelectionList::RemoveSelectionSummary(int index)
int
SelectionList::GetNumSelectionSummarys() const
{
return selectionSummary.size();
return (int)selectionSummary.size();
}
// ****************************************************************************
......
......@@ -845,7 +845,7 @@ SelectionSummary::RemoveVariables(int index)
int
SelectionSummary::GetNumVariables() const
{
return variables.size();
return (int)variables.size();
}
// ****************************************************************************
......
......@@ -760,7 +760,7 @@ ViewerClientInformation::RemoveVars(int index)
int
ViewerClientInformation::GetNumVars() const
{
return vars.size();
return (int)vars.size();
}
// ****************************************************************************
......
......@@ -573,7 +573,7 @@ VisualCueList::RemoveCues(int index)
int
VisualCueList::GetNumCues() const
{
return cues.size();
return (int)cues.size();
}
// ****************************************************************************
......
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