Commit 5eb5ebd6 authored by hkrishna's avatar hkrishna

warning fixes for operators directory

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23663 18c085ea-50e0-402c-830e-de6fd14e8384
parent b27395ae
......@@ -581,7 +581,7 @@ PyAMRStitchCellAttributes_GetLogString()
static void
PyAMRStitchCellAttributes_CallLogRoutine(Subject *subj, void *data)
{
AMRStitchCellAttributes *atts = (AMRStitchCellAttributes *)subj;
AMRStitchCellAttributes *atts = (AMRStitchCellAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -286,7 +286,7 @@ avtAMRStitchCellFilter::PreExecute(void)
for (size_t l=1; l<nLevels; ++l)
{
const std::vector<int>& refRatio = domainNesting->GetLevelRefinementRatios((int)l);
if (refRatio.size() != topologicalDimension)
if (refRatio.size() != (size_t)topologicalDimension)
EXCEPTION1(ImproperUseException,
"Refinement ratio provided by database via domain nesting is invalid. "
"Expected a vector of length equal to topological dataset dimension.");
......@@ -319,7 +319,7 @@ avtAMRStitchCellFilter::PreExecute(void)
for (size_t l=0; l<nLevels; ++l)
{
cellSize[l] = domainNesting->GetLevelCellSizes((int)l);
if (cellSize[l].size() != spatialDimension)
if (cellSize[l].size() != (size_t)spatialDimension)
{
EXCEPTION1(ImproperUseException,
"Database plugin did not properly set level cell sizes using "
......@@ -951,7 +951,7 @@ avtAMRStitchCellFilter::CreateStitchCells(vtkRectilinearGrid *rgrid,
{
// Create unstructured grid for stitch cells
vtkPoints *stitchCellPts = vtkVisItUtility::NewPoints(rgrid);
vtkUnstructuredGrid *stitchCellGrid = vtkUnstructuredGrid::New();
//vtkUnstructuredGrid *stitchCellGrid = vtkUnstructuredGrid::New();
vtkUnstructuredGrid *ugrid = vtkUnstructuredGrid::New();
ugrid->SetPoints(stitchCellPts);
stitchCellPts->Delete();
......
......@@ -326,7 +326,7 @@ PyBoundaryOpAttributes_GetLogString()
static void
PyBoundaryOpAttributes_CallLogRoutine(Subject *subj, void *data)
{
BoundaryOpAttributes *atts = (BoundaryOpAttributes *)subj;
BoundaryOpAttributes *atts = (BoundaryOpAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -580,7 +580,7 @@ PyBoxAttributes_GetLogString()
static void
PyBoxAttributes_CallLogRoutine(Subject *subj, void *data)
{
BoxAttributes *atts = (BoxAttributes *)subj;
BoxAttributes *atts = (BoxAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -184,8 +184,8 @@ vtkBoxFilter::RequestData(
{
pointMap[i] = -1;
}
bool *isInBox;
char *relativeToBox[3];
bool *isInBox = NULL; ///TODO: check on fix for uninitialized pointer
char *relativeToBox[3] = {NULL, NULL, NULL}; ///TODO: check on fix for uninitialized pointer
float bxpts[8][3];
double bounds[6];
......
......@@ -443,7 +443,7 @@ PyCartographicProjectionAttributes_GetLogString()
static void
PyCartographicProjectionAttributes_CallLogRoutine(Subject *subj, void *data)
{
CartographicProjectionAttributes *atts = (CartographicProjectionAttributes *)subj;
CartographicProjectionAttributes *atts = (CartographicProjectionAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -304,8 +304,9 @@ avtCartographicProjectionFilter::ExecuteData(vtkDataSet *in_ds, int, std::string
ds->SetPoints(newPoints);
if(do_type != VTK_POLY_DATA)
if(do_type != VTK_POLY_DATA) {
debug4 << "dims = " << dims[0] << " x " << dims[1] << " x " << dims[2] << endl;
}
if(do_type == VTK_RECTILINEAR_GRID)
inPts->Delete();
......
......@@ -659,7 +659,7 @@ ClipAttributes::CreateCompatible(const std::string &tname) const
else if(tname == "PlaneAttributes" && GetPlaneToolControlledClipPlane() != None)
{
PlaneAttributes *p = new PlaneAttributes;
const double *normal_arr;
const double *normal_arr = NULL; //TODO: check on fix for uninitialized array
switch (GetPlaneToolControlledClipPlane())
{
......
......@@ -1222,7 +1222,7 @@ PyClipAttributes_GetLogString()
static void
PyClipAttributes_CallLogRoutine(Subject *subj, void *data)
{
ClipAttributes *atts = (ClipAttributes *)subj;
ClipAttributes *atts = (ClipAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -593,7 +593,7 @@ avtClipFilter::ComputeFastClip(vtkDataSet *inDS, vtkDataSet **outDS,
vtkImplicitBoolean *ifuncs = vtkImplicitBoolean::New();
vtkDataSet *output = NULL;
int nDataSets = 0;
//int nDataSets = 0;
bool inverse = false;
bool funcSet = SetUpClipFunctions(ifuncs, inverse);
if (!funcSet)
......@@ -850,7 +850,7 @@ avtClipFilter::Clip1DRGrid(vtkImplicitBoolean *ifuncs, bool inv,
vtkDataArray *outXC = outGrid->GetXCoordinates();
vtkDataArray *outVal = inVal->NewInstance();
int nx = inXC->GetNumberOfTuples();
//int nx = inXC->GetNumberOfTuples();
double lastX = inXC->GetTuple1(0);
double lastVal = inVal->GetTuple1(0);
......@@ -875,7 +875,7 @@ avtClipFilter::Clip1DRGrid(vtkImplicitBoolean *ifuncs, bool inv,
if ((dist <= 0 && inv) || (lastDist > 0 && !inv))
whichCase += 2;
double x1, x2, d1 = 0., d2 = 1., v1, v2, newX = 0., newVal = 0.;
double x1 = 0, x2 = 0, d1 = 0., d2 = 1., v1 = 0, v2 = 0, newX = 0., newVal = 0.; ///TODO: check on fix for uninitialized values
switch(whichCase)
{
case 1 :
......
......@@ -686,7 +686,7 @@ PyConeAttributes_GetLogString()
static void
PyConeAttributes_CallLogRoutine(Subject *subj, void *data)
{
ConeAttributes *atts = (ConeAttributes *)subj;
ConeAttributes *atts = (ConeAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -329,7 +329,7 @@ PyConnectedComponentsAttributes_GetLogString()
static void
PyConnectedComponentsAttributes_CallLogRoutine(Subject *subj, void *data)
{
ConnectedComponentsAttributes *atts = (ConnectedComponentsAttributes *)subj;
ConnectedComponentsAttributes *atts = (ConnectedComponentsAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -161,7 +161,7 @@ avtConnectedComponentsFilter::InferVariableNameFromContract(avtContract_p c)
if (!foundIt)
{
std::vector<CharStrRef> vars2nd = in_dr->GetSecondaryVariablesWithoutDuplicates();
for (int i = 0 ; i < vars2nd.size() ; i++)
for (size_t i = 0 ; i < vars2nd.size() ; i++)
if (strncmp(*(vars2nd[i]), "operators/ConnectedComponents/",
strlen("operators/ConnectedComponents/")) == 0)
{
......
......@@ -489,7 +489,7 @@ PyCoordSwapAttributes_GetLogString()
static void
PyCoordSwapAttributes_CallLogRoutine(Subject *subj, void *data)
{
CoordSwapAttributes *atts = (CoordSwapAttributes *)subj;
CoordSwapAttributes *atts = (CoordSwapAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -559,7 +559,7 @@ PyCracksClipperAttributes_GetLogString()
static void
PyCracksClipperAttributes_CallLogRoutine(Subject *subj, void *data)
{
CracksClipperAttributes *atts = (CracksClipperAttributes *)subj;
CracksClipperAttributes *atts = (CracksClipperAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -275,8 +275,8 @@ vtkCrackWidthFilter::RequestData(
// step through cells, calculating cell centers and crack widths for
// each crack direction. Terminate early when possible.
//
vtkDoubleArray *crackWidth;
double delta, cw, zVol, *dir, *maxCW;
vtkDoubleArray *crackWidth = NULL; ///TODO: check on fix for uninitialized vars
double delta = 0, cw, zVol, *dir = NULL, *maxCW = NULL; ///TODO: check on fix for unitialized vars
int crackOrder[3];
for (vtkIdType cellId = 0; cellId < numCells; cellId++)
......
......@@ -1101,7 +1101,7 @@ PyCreateBondsAttributes_GetLogString()
static void
PyCreateBondsAttributes_CallLogRoutine(Subject *subj, void *data)
{
CreateBondsAttributes *atts = (CreateBondsAttributes *)subj;
CreateBondsAttributes *atts = (CreateBondsAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -295,7 +295,7 @@ avtCreateBondsFilter::ExecuteData(vtkDataSet *in_ds, int, string)
//
float maxBondDist = 0.;
vector<double> &maxDist = atts.GetMaxDist();
for (int i=0; i<maxDist.size(); i++)
for (size_t i=0; i<maxDist.size(); i++)
{
if (maxDist[i] > maxBondDist)
maxBondDist = maxDist[i];
......@@ -460,9 +460,9 @@ avtCreateBondsFilter::ExecuteData_Fast(vtkPolyData *in, float maxBondDist,
// for periodic atom images
//
bool addPeriodicBonds = atts.GetAddPeriodicBonds();
bool xper = addPeriodicBonds && atts.GetPeriodicInX();
bool yper = addPeriodicBonds && atts.GetPeriodicInY();
bool zper = addPeriodicBonds && atts.GetPeriodicInZ();
//bool xper = addPeriodicBonds && atts.GetPeriodicInX();
//bool yper = addPeriodicBonds && atts.GetPeriodicInY();
//bool zper = addPeriodicBonds && atts.GetPeriodicInZ();
double xv[3], yv[3], zv[3];
for (int j=0; j<3; j++)
{
......
......@@ -513,7 +513,7 @@ PyCylinderAttributes_GetLogString()
static void
PyCylinderAttributes_CallLogRoutine(Subject *subj, void *data)
{
CylinderAttributes *atts = (CylinderAttributes *)subj;
CylinderAttributes *atts = (CylinderAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -288,7 +288,7 @@ avtCylinderFilter::ExecuteData(vtkDataSet *in_ds, int, std::string)
void
avtCylinderFilter::UpdateDataObjectInfo(void)
{
avtDataAttributes &inAtts = GetInput()->GetInfo().GetAttributes();
//avtDataAttributes &inAtts = GetInput()->GetInfo().GetAttributes();
avtDataAttributes &outAtts = GetOutput()->GetInfo().GetAttributes();
avtDataValidity &outValidity = GetOutput()->GetInfo().GetValidity();
......
......@@ -1382,7 +1382,7 @@ PyDataBinningAttributes_GetLogString()
static void
PyDataBinningAttributes_CallLogRoutine(Subject *subj, void *data)
{
DataBinningAttributes *atts = (DataBinningAttributes *)subj;
DataBinningAttributes *atts = (DataBinningAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -1047,7 +1047,7 @@ QvisDataBinningWindow::dim1BinBasedOnChanged(int val)
newVal = DataBinningAttributes::X;
else if (val == 2)
newVal = DataBinningAttributes::Y;
else if (val == 3)
else /*if (val == 3) */
newVal = DataBinningAttributes::Z;
if(newVal != atts->GetDim1BinBasedOn())
{
......@@ -1066,7 +1066,7 @@ QvisDataBinningWindow::dim2BinBasedOnChanged(int val)
newVal = DataBinningAttributes::X;
else if (val == 2)
newVal = DataBinningAttributes::Y;
else if (val == 3)
else /*if (val == 3) */
newVal = DataBinningAttributes::Z;
if(newVal != atts->GetDim2BinBasedOn())
{
......@@ -1085,7 +1085,7 @@ QvisDataBinningWindow::dim3BinBasedOnChanged(int val)
newVal = DataBinningAttributes::X;
else if (val == 2)
newVal = DataBinningAttributes::Y;
else if (val == 3)
else /*if (val == 3)*/
newVal = DataBinningAttributes::Z;
if(newVal != atts->GetDim3BinBasedOn())
{
......
......@@ -350,8 +350,8 @@ avtDataBinningFilter::Execute(void)
SetOutputDataTree(new avtDataTree());
avtDataAttributes &dataAtts = GetOutput()->GetInfo().GetAttributes();
int dim = ( (atts.GetNumDimensions() == DataBinningAttributes::One) ? 1
: ((atts.GetNumDimensions() == DataBinningAttributes::Two) ? 2 : 3));
//int dim = ( (atts.GetNumDimensions() == DataBinningAttributes::One) ? 1
// : ((atts.GetNumDimensions() == DataBinningAttributes::Two) ? 2 : 3));
dataAtts.GetThisProcsOriginalSpatialExtents()->Set(&bb[0]);
dataAtts.GetOriginalSpatialExtents()->Set(&bb[0]);
}
......@@ -557,7 +557,7 @@ avtDataBinningFilter::ModifyContract(avtContract_p inContract)
out_dr = new avtDataRequest(in_dr);
std::vector<CharStrRef> vars2nd = in_dr->GetSecondaryVariablesWithoutDuplicates();
std::vector<std::string> removeMe;
int i;
size_t i;
for (i = 0 ; i < vars2nd.size() ; i++)
if (strncmp(*(vars2nd[i]), "operators/DataBinning", strlen("operators/DataBinning")) == 0)
{
......@@ -679,7 +679,7 @@ avtDataBinningFilter::ModifyContract(avtContract_p inContract)
void
avtDataBinningFilter::UpdateDataObjectInfo(void)
{
avtDataAttributes &inAtts = GetInput()->GetInfo().GetAttributes();
//avtDataAttributes &inAtts = GetInput()->GetInfo().GetAttributes();
avtDataAttributes &dataAtts = GetOutput()->GetInfo().GetAttributes();
dataAtts.AddVariable(varname);
dataAtts.SetActiveVariable(varname.c_str());
......
......@@ -326,7 +326,7 @@ PyDecimateAttributes_GetLogString()
static void
PyDecimateAttributes_CallLogRoutine(Subject *subj, void *data)
{
DecimateAttributes *atts = (DecimateAttributes *)subj;
DecimateAttributes *atts = (DecimateAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -365,7 +365,7 @@ PyDeferExpressionAttributes_GetLogString()
static void
PyDeferExpressionAttributes_CallLogRoutine(Subject *subj, void *data)
{
DeferExpressionAttributes *atts = (DeferExpressionAttributes *)subj;
DeferExpressionAttributes *atts = (DeferExpressionAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -185,7 +185,7 @@ QvisDeferExpressionWindow::UpdateWindow(bool doAll)
case DeferExpressionAttributes::ID_exprs:
{
QString res;
for (int j = 0 ; j < atts->GetExprs().size() ; j++)
for (size_t j = 0 ; j < atts->GetExprs().size() ; j++)
{
if(j !=0)
res += " ";
......
......@@ -359,7 +359,7 @@ PyDelaunayAttributes_GetLogString()
static void
PyDelaunayAttributes_CallLogRoutine(Subject *subj, void *data)
{
DelaunayAttributes *atts = (DelaunayAttributes *)subj;
DelaunayAttributes *atts = (DelaunayAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -358,7 +358,7 @@ PyDisplaceAttributes_GetLogString()
static void
PyDisplaceAttributes_CallLogRoutine(Subject *subj, void *data)
{
DisplaceAttributes *atts = (DisplaceAttributes *)subj;
DisplaceAttributes *atts = (DisplaceAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -359,7 +359,7 @@ PyDualMeshAttributes_GetLogString()
static void
PyDualMeshAttributes_CallLogRoutine(Subject *subj, void *data)
{
DualMeshAttributes *atts = (DualMeshAttributes *)subj;
DualMeshAttributes *atts = (DualMeshAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -329,7 +329,7 @@ PyEdgeAttributes_GetLogString()
static void
PyEdgeAttributes_CallLogRoutine(Subject *subj, void *data)
{
EdgeAttributes *atts = (EdgeAttributes *)subj;
EdgeAttributes *atts = (EdgeAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -686,7 +686,7 @@ PyElevateAttributes_GetLogString()
static void
PyElevateAttributes_CallLogRoutine(Subject *subj, void *data)
{
ElevateAttributes *atts = (ElevateAttributes *)subj;
ElevateAttributes *atts = (ElevateAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -522,7 +522,7 @@ PyEllipsoidSliceAttributes_GetLogString()
static void
PyEllipsoidSliceAttributes_CallLogRoutine(Subject *subj, void *data)
{
EllipsoidSliceAttributes *atts = (EllipsoidSliceAttributes *)subj;
EllipsoidSliceAttributes *atts = (EllipsoidSliceAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -364,7 +364,7 @@ PyExternalSurfaceAttributes_GetLogString()
static void
PyExternalSurfaceAttributes_CallLogRoutine(Subject *subj, void *data)
{
ExternalSurfaceAttributes *atts = (ExternalSurfaceAttributes *)subj;
ExternalSurfaceAttributes *atts = (ExternalSurfaceAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -358,7 +358,7 @@ PyExtractPointFunction2DAttributes_GetLogString()
static void
PyExtractPointFunction2DAttributes_CallLogRoutine(Subject *subj, void *data)
{
ExtractPointFunction2DAttributes *atts = (ExtractPointFunction2DAttributes *)subj;
ExtractPointFunction2DAttributes *atts = (ExtractPointFunction2DAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -204,14 +204,15 @@ avtExtractPointFunction2DFilter::ExecuteData(vtkDataSet *in_ds, int domain, std:
int iMax = base_index[0] + dims[0] - 1;
int jMin = base_index[1];
int jMax = base_index[1] + dims[1] - 1;
int kMin = base_index[2];
int kMax = base_index[2] + dims[2] - 1;
//int kMin = base_index[2];
//int kMax = base_index[2] + dims[2] - 1;
int avtRealDims[6] = { 0, 0, 0, 0, 0, 0 };
if (arr)
for (int d = 0; d < 6; ++d)
avtRealDims[d] = arr->GetValue(d);
(void) avtRealDims; ///suppress unused warning
// FIXME: Take avtRealDims into account
if (iMin <= atts.GetI() && atts.GetI() <= iMax && jMin <= atts.GetJ() && atts.GetJ() <= jMax)
{
......
......@@ -469,7 +469,7 @@ PyExtrudeAttributes_GetLogString()
static void
PyExtrudeAttributes_CallLogRoutine(Subject *subj, void *data)
{
ExtrudeAttributes *atts = (ExtrudeAttributes *)subj;
ExtrudeAttributes *atts = (ExtrudeAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -752,7 +752,7 @@ avtExtrudeFilter::UpdateDataObjectInfo(void)
// Now extrude the extents.
//
double b[6];
int olddim = inAtts.GetSpatialDimension();
//int olddim = inAtts.GetSpatialDimension();
if (inAtts.GetOriginalSpatialExtents()->HasExtents())
{
inAtts.GetOriginalSpatialExtents()->CopyTo(b);
......
......@@ -326,7 +326,7 @@ PyFFTAttributes_GetLogString()
static void
PyFFTAttributes_CallLogRoutine(Subject *subj, void *data)
{
FFTAttributes *atts = (FFTAttributes *)subj;
FFTAttributes *atts = (FFTAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -662,7 +662,7 @@ PyFiveFoldTetSubdivisionAttributes_GetLogString()
static void
PyFiveFoldTetSubdivisionAttributes_CallLogRoutine(Subject *subj, void *data)
{
FiveFoldTetSubdivisionAttributes *atts = (FiveFoldTetSubdivisionAttributes *)subj;
FiveFoldTetSubdivisionAttributes *atts = (FiveFoldTetSubdivisionAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -393,7 +393,7 @@ PyFluxAttributes_GetLogString()
static void
PyFluxAttributes_CallLogRoutine(Subject *subj, void *data)
{
FluxAttributes *atts = (FluxAttributes *)subj;
FluxAttributes *atts = (FluxAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -168,7 +168,7 @@ avtFluxFilter::InferVariableNameFromContract(avtContract_p c)
if (!foundIt)
{
std::vector<CharStrRef> vars2nd = in_dr->GetSecondaryVariablesWithoutDuplicates();
for (int i = 0 ; i < vars2nd.size() ; i++)
for (size_t i = 0 ; i < vars2nd.size() ; i++)
if (strncmp(*(vars2nd[i]), "operators/Flux/",
strlen("operators/Flux/")) == 0)
{
......
......@@ -251,7 +251,7 @@ IndexSelectViewerPluginInfo::InitializeOperatorAtts(AttributeSubject *atts,
restriction->GetSILCollection(colIndex);
if (*collection != NULL)
{
int nSets = collection->GetNumberOfSubsets();
size_t nSets = collection->GetNumberOfSubsets();
for (size_t i = 0; i < nSets && !subsetNameValid; ++i)
{
bool isOn = false;
......
......@@ -1012,7 +1012,7 @@ PyIndexSelectAttributes_GetLogString()
static void
PyIndexSelectAttributes_CallLogRoutine(Subject *subj, void *data)
{
IndexSelectAttributes *atts = (IndexSelectAttributes *)subj;
IndexSelectAttributes *atts = (IndexSelectAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -846,7 +846,7 @@ avtIndexSelectFilter::ModifyContract(avtContract_p spec)
}
if (*speciesColl != NULL)
{
for (i = 0 ; i < speciesColl->GetNumberOfSubsets() ; i++)
for (i = 0 ; i < (unsigned int)speciesColl->GetNumberOfSubsets() ; i++)
setState.push_back(trav.UsesData(speciesColl->GetSubset(i)));
}
// End logic for seeing which species is on.
......@@ -857,10 +857,10 @@ avtIndexSelectFilter::ModifyContract(avtContract_p spec)
// We've just turned on an entire set, but some parts
// (materials) may have been turned off before, so ensure
// that remains the case.
int numSets = silr->GetNumSets();
unsigned int numSets = silr->GetNumSets();
for (i = 0; i < numSets ; i++)
{
if (setID == i)
if ((unsigned int)setID == i)
continue;
if (trav.UsesSetData(i) == NoneUsed)
silr->TurnOffSet(i);
......@@ -901,7 +901,7 @@ avtIndexSelectFilter::ModifyContract(avtContract_p spec)
{
intVector chunks;
trav.GetDomainList(chunks);
for (int i = 0; i < chunks.size(); i++)
for (size_t i = 0; i < chunks.size(); i++)
{
bool hasMats = false;
trav.GetMaterials(chunks[i], hasMats);
......
......@@ -236,7 +236,7 @@ IntegralCurveViewerPluginInfo::GetOperatorVarDescription(AttributeSubject *atts,
{
IntegralCurveAttributes *atts_in = (IntegralCurveAttributes *)atts;
const char numTypes = 11;
//const char numTypes = 11;
const char *typeString[11] =
{ "None", "Seed Point ID", "Speed", "Vorticity", "Arc Length",
"Absolute Time", "Relative Time",
......
......@@ -3507,7 +3507,7 @@ PyIntegralCurveAttributes_GetLogString()
static void
PyIntegralCurveAttributes_CallLogRoutine(Subject *subj, void *data)
{
IntegralCurveAttributes *atts = (IntegralCurveAttributes *)subj;
IntegralCurveAttributes *atts = (IntegralCurveAttributes *)subj; (void) atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -978,7 +978,7 @@ QvisIntegralCurveWindow::CreateAppearanceTab(QWidget *pageAppearance)
void
QvisIntegralCurveWindow::CreateAdvancedTab(QWidget *pageAdvanced)
{
int row = 0;
//int row = 0;
QGridLayout *mainLayout = new QGridLayout(pageAdvanced);
mainLayout->setMargin(5);
mainLayout->setSpacing(5);
......@@ -1242,7 +1242,7 @@ QvisIntegralCurveWindow::UpdateWindow(bool doAll)
std::vector<double> points = atts->GetPointList();
pointList->clear();
for (int i = 0; i < points.size(); i+= 3)
for (size_t i = 0; i < points.size(); i+= 3)
{
char tmp[256];
sprintf(tmp, "%lf %lf %lf", points[i], points[i+1], points[i+2]);
......@@ -2642,7 +2642,7 @@ QvisIntegralCurveWindow::GetCurrentValues(int which_widget)
}
if (which_widget == IntegralCurveAttributes::ID_selection || doAll)
{
int val = selections->currentIndex();
int val = selections->currentIndex(); (void) val; /// TODO: is this necessary?
}
}
......
......@@ -488,7 +488,7 @@ avtIntegralCurveFilter::UpdateDataObjectInfo(void)
avtDataAttributes &in_atts = GetInput()->GetInfo().GetAttributes();
avtDataAttributes &out_atts = GetOutput()->GetInfo().GetAttributes();
avtDataValidity &val = GetOutput()->GetInfo().GetValidity();
//avtDataValidity &val = GetOutput()->GetInfo().GetValidity();
if( outVarName != "" )
{
......@@ -2139,8 +2139,9 @@ avtIntegralCurveFilter::ReportWarnings(std::vector<avtIntegralCurve *> &ics)
int numStiff = 0;
int numCritPts = 0;
if (DebugStream::Level5())
if (DebugStream::Level5()) {
debug5 << "::CreateIntegralCurveOutput " << ics.size() << endl;
}
//See how many pts, ics we have so we can preallocate everything.
for (int i = 0; i < numICs; i++)
......@@ -2289,12 +2290,13 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve *
return;
int numICs = ics.size(), numPts = 0;
int numEarlyTerminators = 0;
int numStiff = 0;
int numCritPts = 0;
//int numEarlyTerminators = 0;
//int numStiff = 0;
//int numCritPts = 0;
if (DebugStream::Level5())
if (DebugStream::Level5()) {
debug5 << "::CreateIntegralCurveOutput " << ics.size() << endl;
}
vtkAppendPolyData *append = vtkAppendPolyData::New();
...