Commit 73611f7b authored by bonnell's avatar bonnell

Remove HAVE_STRERROR, no longer used in VisIt.

Remove various unreferenced variables and other compiler warnings.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@13991 18c085ea-50e0-402c-830e-de6fd14e8384
parent 6f1e2c18
......@@ -218,6 +218,9 @@
# Added init of opt_ARG_PREV in VISIT_OPTION_DEFAULT to avoid cmake
# warning message.
#
# Kathleen Bonnell, Mon Feb 14 11:09:17 MST 2011
# Remove strerror test, HAVE_STRERROR no longer used in VisIt.
#
#****************************************************************************/
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
......@@ -1434,7 +1437,6 @@ ENDFUNCTION(CHECK_FTIME_PROTOTYPE)
# Check for some functions
CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE)
CHECK_FUNCTION_EXISTS(strerror HAVE_STRERROR)
CHECK_FUNCTION_EXISTS(div HAVE_DIV)
CHECK_FUNCTION_EXISTS(setenv HAVE_SETENV)
CHECK_FUNCTION_EXISTS(strtof HAVE_STRTOF)
......
......@@ -138,7 +138,6 @@ avtDataBinning::CreateGrid(void)
// Note the assumption here that the X-axis corresponds to tuple 0,
// the Y-axis to tuple 1, etc.
float center[3];
loc[0] = (bbox[0] + bbox[1]) / 2.;
loc[1] = (bbox[2] + bbox[3]) / 2.;
loc[2] = (bbox[4] + bbox[5]) / 2.;
......
......@@ -314,7 +314,7 @@ void
avtMTMDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
int timeState, bool)
{
int i, j;
int i;
GenerateTimestepCounts();
......
......@@ -838,7 +838,6 @@ avtStructuredDomainNesting::GetChildrenForLogicalIndex(int domain, int ijk[3],
domainNesting[domain].logicalExtents[5]);
}
bool inside_i, inside_j, inside_k;
int child_ext[6];
vector<int> ratios;
......@@ -1076,7 +1075,7 @@ void avtStructuredDomainNesting::ComputeChildBoundingBox(int domain)
vector<int> ratios;
int ext;
for(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]);
......
......@@ -2937,7 +2937,7 @@ void
avtConnComponentsExpression::SpatialPartition::CreatePartition
(const BoundarySet &bset, double *bounds)
{
int i, j, k;
int i, j;
int t0 = visitTimer->StartTimer();
if (itree != NULL)
......
......@@ -132,7 +132,7 @@ struct IVP_API MemStream
friend std::ostream& operator<<(std::ostream &out, const MemStream &m)
{
out<<" MemStream(p= "<<m.pos()<<", l= "<<m.len()<<"["<<m.capacity()<<"]) data=[";
for (int i=0; i < m.len(); i++)
for (size_t i=0; i < m.len(); i++)
out<<(int)(m._data[i])<<" ";
out<<"]";
return out;
......
......@@ -76,7 +76,7 @@ void avtCellLocatorClassic::Free()
{
if( Tree )
{
for( int i=0; i<NumberOfOctants; i++ )
for( unsigned int i=0; i<NumberOfOctants; i++ )
{
if( Tree[i] )
Tree[i]->Delete();
......@@ -126,7 +126,7 @@ void avtCellLocatorClassic::Build()
// compute number of octants and number of divisions
int ndivs = 1, prod = 1, noct = 1;
for( int i=0; i<Level; ++i )
for( unsigned int i=0; i<Level; ++i )
{
ndivs *= 2;
prod *= 8;
......
......@@ -803,7 +803,7 @@ DiscreteMIR::ReconstructMesh(vtkDataSet *mesh_orig, avtMaterial *mat_orig, int d
ring.push_back(id(edge_begin));
}
for(int t = 0; t < ring.size(); ++t)
for(size_t t = 0; t < ring.size(); ++t)
{
ReconstructedZone zone;
zone.origzone = cellid;
......@@ -1149,7 +1149,7 @@ DiscreteMIR::ReconstructMesh(vtkDataSet *mesh_orig, avtMaterial *mat_orig, int d
#if 1
// Make each of the small tets.
for(int st = 0; st < small_tets.size(); st += 3)
for(size_t st = 0; st < small_tets.size(); st += 3)
{
// Make sure that the centroid handle exists.
if (centroid_handles[small_tets[st]] == 0)
......@@ -1176,7 +1176,7 @@ DiscreteMIR::ReconstructMesh(vtkDataSet *mesh_orig, avtMaterial *mat_orig, int d
// Maybe make the big tets if the corresponding face has a
// centroid point. If there is no centroid point, then
// we'll skip it and handle it in the next section.
for(int bt = 0; bt < big_tets.size(); bt += 3)
for(size_t bt = 0; bt < big_tets.size(); bt += 3)
{
// Skip this tet if the corresponding face's centroid
// doesn't exist.
......
......@@ -2040,7 +2040,7 @@ bool
LineIntersectsBox2D(double *bounds, double invDirX, double invDirY,
double originX, double originY, int signX, int signY)
{
double tmin, tmax, tymin, tymax, tzmin, tzmax;
double tmin, tmax, tymin, tymax;
tmin = (bounds[signX] - originX) * invDirX;
tmax = (bounds[1-signX] - originX) * invDirX;
......
......@@ -459,7 +459,7 @@ avtFloatingPointIdNamedSelection::CreateConditionString(void)
// convert all the identifiers into a string...
std::string id_string = "( id in ( "; // Prabhat- TODO id is hardcoded here..
for (int j=0; j<ids.size()-1; j++)
for (size_t j=0; j<ids.size()-1; j++)
id_string = id_string + stringify(ids[j]) + ", ";
id_string = id_string + stringify(ids[ids.size()-1]) + " ))";
......
......@@ -119,7 +119,7 @@ avtPythonFilter::GetAttribute(const string &attr_name, int &res)
long lres = PyInt_AsLong(py_obj);
Py_DECREF(py_obj);
if(lres == -1); // check for python error.
//if(lres == -1); // check for python error.
res = int(lres);
return true;
......
......@@ -297,7 +297,7 @@ ListExpr::ExtractNumericElements(vector<double> &output)
std::vector<ListElemExpr*> *elems = GetElems();
for (int i = 0 ; i < elems->size() ; i++)
for (size_t i = 0 ; i < elems->size() ; i++)
{
ExprNode *item = (*elems)[i]->GetItem();
if (item->GetTypeName() == "FloatConst")
......@@ -329,7 +329,7 @@ ListExpr::ExtractStringElements(vector<std::string> &output)
std::vector<ListElemExpr*> *elems = GetElems();
for (int i = 0 ; i < elems->size() ; i++)
for (size_t i = 0 ; i < elems->size() ; i++)
{
ExprNode *item = (*elems)[i]->GetItem();
if (item->GetTypeName() == "StringConst")
......
......@@ -1220,7 +1220,7 @@ FileOpenOptions::AddAssumedFormatsToPreferred(const stringVector &given)
{
// get its actual ID
std::string id = "";
for (int j=0; j<typeIDs.size(); j++)
for (size_t j=0; j<typeIDs.size(); j++)
{
if (given[i] == typeIDs[j] ||
given[i] == typeNames[j])
......@@ -1236,7 +1236,7 @@ FileOpenOptions::AddAssumedFormatsToPreferred(const stringVector &given)
// make a new list with this given one at the front
stringVector newPreferredIDs;
newPreferredIDs.push_back(id);
for (int j=0; j<preferredIDs.size(); j++)
for (size_t j=0; j<preferredIDs.size(); j++)
{
if (preferredIDs[j] != id)
newPreferredIDs.push_back(preferredIDs[j]);
......@@ -1264,11 +1264,11 @@ void
FileOpenOptions::AddFallbackFormatsToPreferred(const stringVector &given)
{
// for each format, append it
for (int i=0; i<given.size(); i++)
for (size_t i=0; i<given.size(); i++)
{
// get its actual ID
std::string id = "";
for (int j=0; j<typeIDs.size(); j++)
for (size_t j=0; j<typeIDs.size(); j++)
{
if (given[i] == typeIDs[j] ||
given[i] == typeNames[j])
......@@ -1283,7 +1283,7 @@ FileOpenOptions::AddFallbackFormatsToPreferred(const stringVector &given)
// make a new list with this given one at the back
stringVector newPreferredIDs;
for (int j=0; j<preferredIDs.size(); j++)
for (size_t j=0; j<preferredIDs.size(); j++)
{
if (preferredIDs[j] != id)
newPreferredIDs.push_back(preferredIDs[j]);
......
......@@ -203,7 +203,7 @@ FileOpenOptions::AddAssumedFormatsToPreferred(const stringVector &given)
{
// get its actual ID
std::string id = "";
for (int j=0; j<typeIDs.size(); j++)
for (size_t j=0; j<typeIDs.size(); j++)
{
if (given[i] == typeIDs[j] ||
given[i] == typeNames[j])
......@@ -219,7 +219,7 @@ FileOpenOptions::AddAssumedFormatsToPreferred(const stringVector &given)
// make a new list with this given one at the front
stringVector newPreferredIDs;
newPreferredIDs.push_back(id);
for (int j=0; j<preferredIDs.size(); j++)
for (size_t j=0; j<preferredIDs.size(); j++)
{
if (preferredIDs[j] != id)
newPreferredIDs.push_back(preferredIDs[j]);
......@@ -251,11 +251,11 @@ void
FileOpenOptions::AddFallbackFormatsToPreferred(const stringVector &given)
{
// for each format, append it
for (int i=0; i<given.size(); i++)
for (size_t i=0; i<given.size(); i++)
{
// get its actual ID
std::string id = "";
for (int j=0; j<typeIDs.size(); j++)
for (size_t j=0; j<typeIDs.size(); j++)
{
if (given[i] == typeIDs[j] ||
given[i] == typeNames[j])
......@@ -270,7 +270,7 @@ FileOpenOptions::AddFallbackFormatsToPreferred(const stringVector &given)
// make a new list with this given one at the back
stringVector newPreferredIDs;
for (int j=0; j<preferredIDs.size(); j++)
for (size_t j=0; j<preferredIDs.size(); j++)
{
if (preferredIDs[j] != id)
newPreferredIDs.push_back(preferredIDs[j]);
......
......@@ -3178,7 +3178,7 @@ PickAttributes::PrintSelf(ostream &os)
std::string fileName;
std::string format;
int pos = databaseName.find_last_of('/');
size_t pos = databaseName.find_last_of('/');
if (pos >= databaseName.size())
fileName = databaseName;
else
......@@ -3447,7 +3447,7 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
std::string fileName;
std::string format;
int pos = databaseName.find_last_of('/');
size_t pos = databaseName.find_last_of('/');
if (pos >= databaseName.size())
fileName = databaseName;
else
......@@ -3886,7 +3886,7 @@ PickAttributes::CreateConciseOutputString(std::string &os, bool withLetter)
std::string fileName;
std::string format;
int pos = databaseName.find_last_of('/');
size_t pos = databaseName.find_last_of('/');
if (pos >= databaseName.size())
fileName = databaseName;
else
......
......@@ -59,7 +59,7 @@ PickAttributes::PrintSelf(ostream &os)
std::string fileName;
std::string format;
int pos = databaseName.find_last_of('/');
size_t pos = databaseName.find_last_of('/');
if (pos >= databaseName.size())
fileName = databaseName;
else
......@@ -331,7 +331,7 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
std::string fileName;
std::string format;
int pos = databaseName.find_last_of('/');
size_t pos = databaseName.find_last_of('/');
if (pos >= databaseName.size())
fileName = databaseName;
else
......@@ -1007,7 +1007,7 @@ PickAttributes::CreateConciseOutputString(std::string &os, bool withLetter)
std::string fileName;
std::string format;
int pos = databaseName.find_last_of('/');
size_t pos = databaseName.find_last_of('/');
if (pos >= databaseName.size())
fileName = databaseName;
else
......
......@@ -177,7 +177,7 @@ class MRUCacheBase {
iterator find(const vector<kT>& keys)
{
iterator mpos;
for (int i = 0; i < keys.size(); i++)
for (size_t i = 0; i < keys.size(); i++)
{
mpos = find(keys[i]);
if (mpos != end())
......
......@@ -1735,7 +1735,7 @@ void vtkCEAucdReader::ClearCache()
this->CachedFileName = 0;
this->CachedFileStream = 0;
this->CachedGlobalOffset = 0;
for(int i=0;i<CachedOutputs.size();i++)
for(size_t i=0;i<CachedOutputs.size();i++)
{
if (this->CachedOutputs[i] != 0) this->CachedOutputs[i]->Delete();
}
......
......@@ -912,12 +912,12 @@ void vtkVisItExodusReader::ReadCells(int exoid, vtkUnstructuredGrid *output)
// VTK unstructured grid.
int totalSize = 0;
int numCells = 0;
for (i = 0; i < connect.size(); i++)
for (size_t j = 0; j < connect.size(); j++)
{
if(cell_num_points[i] != 0)
if(cell_num_points[j] != 0)
{
totalSize += (cell_num_points[i]+1)*(num_elem_in_block[i]);
numCells += num_elem_in_block[i];
totalSize += (cell_num_points[j]+1)*(num_elem_in_block[j]);
numCells += num_elem_in_block[j];
}
}
......@@ -968,9 +968,9 @@ void vtkVisItExodusReader::ReadCells(int exoid, vtkUnstructuredGrid *output)
}
}
for (i = 0 ; i < connect.size() ; i++)
if (connect[i] != NULL)
delete [] connect[i];
for (size_t j = 0 ; j < connect.size() ; j++)
if (connect[j] != NULL)
delete [] connect[j];
vtkCellArray *cells = vtkCellArray::New();
cells->SetCells(numCells, nlist);
......
......@@ -129,7 +129,7 @@ avtH5NimrodFileFormat::avtH5NimrodFileFormat (const char *filename):
{
// INITIALIZE DATA MEMBERS
fname = filename;
hid_t file_id, root_id, group_id, dataset_id;
hid_t file_id, root_id, group_id;
char *string_attrib;
float time;
......
......@@ -848,7 +848,6 @@ void avtM3DC1Field::interpdX2(float *var, int el, double *lcoords,
{
float *a = var + scalar_size*el;
double xi = lcoords[0], eta = lcoords[1];
int index;
if( element_dimension == 2 )
{
......
......@@ -2066,7 +2066,6 @@ void avtMFIXFileFormat::GetBlockOfInts(istream& in, vtkIntArray *v, int n)
void avtMFIXFileFormat::SkipBlockOfInts(istream& in, int n)
{
const int numberOfIntsInBlock = 512/sizeof(int);
int tempArray[numberOfIntsInBlock];
int numberOfRecords;
if ( n%numberOfIntsInBlock == 0)
......
......@@ -1064,7 +1064,7 @@ NETCDFFileObject::PrintFileContents(ostream &os)
if(attsize > 1)\
{\
debug4 << ", value={";\
for(int k = 0; k < attsize; ++k)\
for(size_t k = 0; k < attsize; ++k)\
{\
if(k > 0)\
debug4 << ", ";\
......
......@@ -2276,7 +2276,6 @@ avtNek5000FileFormat::GetDomainSizeAndVarOffset(int iTimestep, const char *var,
int &outVarOffsetAscii,
int &outTimestepHasMesh )
{
int ii;
outTimestepHasMesh = 0;
UpdateCyclesAndTimes(); //Needs to call this to update iTimestepsWithMesh
......
......@@ -219,7 +219,6 @@ Streaker::ReadStreakFile(const std::string &filename, PDBFileObject *pdb)
char xvar[100];
char yvar[100];
char zvar[100];
char slice[100];
char integrate[100];
char log[100];
char cs[100];
......
......@@ -3807,8 +3807,7 @@ avtSiloFileFormat::ReadDefvars(DBfile *dbfile,
const char *dirname, avtDatabaseMetaData *md)
{
#ifdef DB_VARTYPE_SCALAR
int i,j;
for (i = 0; i < ndefvars; i++)
for (int i = 0; i < ndefvars; i++)
{
DBdefvars *defv = 0;
......@@ -3916,7 +3915,7 @@ avtSiloFileFormat::ReadDir(DBfile *dbfile, const char *dirname,
return;
#endif
int i, j, k;
int i;
DBtoc *toc = DBGetToc(dbfile);
if (toc == NULL)
return;
......@@ -10735,8 +10734,6 @@ CreateCurve(DBcurve *cur, const char *curvename, int vtkType)
vtkDataSet *
avtSiloFileFormat::GetCurve(DBfile *dbfile, const char *cn)
{
int i;
//
// It's ridiculous, but Silo does not have all of the `const's in their
// library, so let's cast it away.
......@@ -14717,7 +14714,7 @@ avtSiloFileFormat::AddAnnotIntNodelistEnumerations(DBfile *dbfile, avtDatabaseMe
static DBgroupelmap *
GetCondensedGroupelMap(DBfile *dbfile, DBmrgtnode *rootNode, int dontForceSingle)
{
int i,j,k,q,pass;
int i,k,q,pass;
DBgroupelmap *retval = 0;
// We do this to prevent Silo for re-interpreting integer data in
......@@ -14859,8 +14856,7 @@ HandleMrgtreeForMultimesh(DBfile *dbfile, DBmultimesh *mm, const char *multimesh
{
#ifdef SILO_VERSION_GE
#if SILO_VERSION_GE(4,6,3)
int i, j, k, q;
char tmpName[256];
int i, j, q;
bool probablyAnAMRMesh = true;
DBgroupelmap *gm = 0;
......
......@@ -202,7 +202,7 @@ PolyhedralSplit::ExpandDataArray(vtkDataArray *input, bool zoneCent,
output = input->NewInstance();
int bloat = 0;
for(int i = 1; i < polyhedralSplit.size(); i += 2)
for(size_t i = 1; i < polyhedralSplit.size(); i += 2)
bloat += (polyhedralSplit[i] - 1);
output->SetNumberOfComponents(input->GetNumberOfComponents());
output->SetNumberOfTuples(input->GetNumberOfTuples() + bloat);
......
......@@ -992,7 +992,6 @@ GetAuxiliaryData(const char *var, const char *type,
matnos[m++] = *i;
char** mnames= new char*[nmats];
char buf[1000];
for( int i=0; i<nmats; i++ ) {
const string& mt = reader_->GetMaterialTitle(matnos[i]);
mnames[i] = new char[ mt.length()+1 ];
......
......@@ -122,7 +122,7 @@ herr_t VsUniformMesh::getLowerBounds(std::vector<float>* fVals) {
std::vector<double> dVals;
err = lowerBoundsAtt->getDoubleVectorValue(&dVals);
fVals->resize(dVals.size());
for (int i = 0; i < dVals.size(); i++) {
for (size_t i = 0; i < dVals.size(); i++) {
(*fVals)[i] = (float)(dVals[i]);
}
} else if (isFloatType(type)) {
......@@ -146,7 +146,7 @@ herr_t VsUniformMesh::getUpperBounds(std::vector<float>* fVals) {
std::vector<double> dVals;
err = upperBoundsAtt->getDoubleVectorValue(&dVals);
fVals->resize(dVals.size());
for (int i = 0; i < dVals.size(); i++) {
for (size_t i = 0; i < dVals.size(); i++) {
(*fVals)[i] = (float)(dVals[i]);
}
} else if (isFloatType(type)) {
......
......@@ -800,7 +800,7 @@ avtVsFileFormat::avtVsFileFormat(const char* dfnm, std::vector<int> settings) :
VsLog::debugLog() <<methodSig <<"Allocation succeeded." <<std::endl;
}
// JRC: what goes here to detect failure to allocate?
catch (vtkstd::bad_alloc& ex) {
catch (vtkstd::bad_alloc) {
VsLog::debugLog() << methodSig <<"Caught vtkstd::bad_alloc exception." <<std::endl;
VsLog::debugLog() << methodSig <<"Unable to allocate space for cells. Cleaning up."
<<std::endl;
......@@ -1495,7 +1495,7 @@ avtVsFileFormat::avtVsFileFormat(const char* dfnm, std::vector<int> settings) :
VsLog::debugLog() <<methodSig <<"Allocating " <<numValues
<< " vertices. If old VTK and this fails, it will just abort." << endl;
meshPtr->Allocate(numValues);
} catch (vtkstd::bad_alloc& ex) {
} catch (vtkstd::bad_alloc) {
VsLog::debugLog() <<methodSig <<"Caught vtkstd::bad_alloc. Unable to allocate cells."
<<"Cleaning up." <<std::endl;
meshPtr->Delete();
......@@ -1598,7 +1598,7 @@ avtVsFileFormat::avtVsFileFormat(const char* dfnm, std::vector<int> settings) :
VsLog::debugLog() <<methodSig <<"Allocating " <<numValues
<< " vertices. If old VTK and this fails, it will just abort." << endl;
meshPtr->Allocate(numValues);
} catch (vtkstd::bad_alloc& ex) {
} catch (vtkstd::bad_alloc) {
VsLog::debugLog() <<methodSig <<"Caught vtkstd::bad_alloc. Unable to allocate cells."
<<"Cleaning up." <<std::endl;
meshPtr->Delete();
......
......@@ -47,7 +47,7 @@
static void UpperCase(const std::string &src, std::string &dest)
{
std::string tmp(src);
for(int i = 0; i < tmp.size(); ++i)
for(size_t i = 0; i < tmp.size(); ++i)
{
char c = tmp[i];
if(tmp[i] >= 'a' && tmp[i] <= 'z')
......
......@@ -316,7 +316,7 @@ NameSimplifier::GetSimplifiedNames(stringVector &n) const
{
n.clear();
for (int i=0; i<names.size(); i++)
for (size_t i=0; i<names.size(); i++)
{
n.push_back(names[i].GetAsString());
}
......
......@@ -302,7 +302,7 @@ QualifiedFilename::DetermineSeparator(const std::string &p) const
{
char sep = VISIT_SLASH_CHAR;
for(int i = 0; i < p.length(); ++i)
for(size_t i = 0; i < p.length(); ++i)
{
if(p[i] == '\\' || p[i] == '/')
{
......@@ -474,7 +474,7 @@ QualifiedFilenameVector
CombineQualifiedFilenameVectors(const QualifiedFilenameVector &a,
const QualifiedFilenameVector &b)
{
int i;
size_t i;
QualifiedFilenameVector retval;
// Add the elements from a if they're not in retval.
......
......@@ -668,7 +668,7 @@ QvisCommandWindow::CreateMacroFromText(const QString &s)
// before it gets applied.
std::string fname("user_macro_");
fname += macroName.toStdString();
for(int i = 0; i < fname.size(); ++i)
for(size_t i = 0; i < fname.size(); ++i)
{
if(!isalpha(fname[i]) && !isdigit(fname[i]) && fname[i] != '_')
fname[i] = '_';
......
......@@ -508,7 +508,7 @@ QvisKeyframeWindow::UpdateWindow(bool doAll)
void
QvisKeyframeWindow::GetCurrentValues(int which_widget)
{
bool okay, doAll = (which_widget == -1);
bool doAll = (which_widget == -1);
QString msg, temp;
// Do nFrames
......
......@@ -380,7 +380,6 @@ QvisMainWindow::QvisMainWindow(int orientation, const char *captionString)
setWindowRole("gui-main");
setAttribute(Qt::WA_DeleteOnClose,true);
int id;
QPixmap saveIcon, computerIcon, printIcon, rainbowIcon;
QPixmap annotIcon, lightIcon, subsetIcon, selectionIcon, viewIcon;
QPixmap exprIcon, animIcon, pluginIcon, pickIcon, copyIcon, lockIcon;
......
......@@ -352,7 +352,7 @@ QvisPlotListBox::clickHandler(const QPoint &clickLocation, bool rightClick,
QvisPlotListBoxItem *actionItem = 0;
// Walk through all of the items, checking if we've clicked in each one.
for (size_t i = 0; i < count(); ++i)
for (int i = 0; i < count(); ++i)
{
QListWidgetItem *current = item(i);
QvisPlotListBoxItem *item2 = (QvisPlotListBoxItem *)current;
......@@ -846,7 +846,7 @@ QvisPlotListBox::contextMenuEvent(QContextMenuEvent *e)
// highlighted/selected, non-intuitive...??)
bool anyActive = false;
for(size_t i = 0; i < count(); ++i)
for(int i = 0; i < count(); ++i)
{
QvisPlotListBoxItem *lbi = (QvisPlotListBoxItem *)item(i);
Plot &currentPlot = lbi->GetPlot();
......
......@@ -1670,7 +1670,7 @@ QvisPlotManagerWidget::PopulateVariableLists(VariableMenuPopulator &populator,
fileServer->GetTreatAllDBsAsTimeVarying());
}
}
CATCH2(GetMetaDataException, gmde)
CATCH(GetMetaDataException)
{
debug1 << "Unable to get metadata when populating variable list" << endl;
return false;
......
......@@ -320,7 +320,7 @@ QvisSequenceMappingModel::printContents() const
{
qDebug("Viewport: %s", it.key().toStdString().c_str());
for(size_t i = 0; i < it.value().size(); ++i)
for(int i = 0; i < it.value().size(); ++i)
{
qDebug("\tsequence: %s, %d", it.value()[i].name.toStdString().c_str(),
it.value()[i].seqType);
......
......@@ -91,7 +91,7 @@ QvisStripChartTabWidget::QvisStripChartTabWidget(QWidget *parent, QObject *mgr,
SC_Info[3] = SC_NamesTabsIndex ( STRIP_CHART_4_WIDGET_NAME,STRIP_CHART_4_TAB_NAME,3);
SC_Info[4] = SC_NamesTabsIndex ( STRIP_CHART_5_WIDGET_NAME,STRIP_CHART_5_TAB_NAME,4);
// create the strip charts
for (size_t i =0; i< SC_Info.size(); i++)
for (int i =0; i< SC_Info.size(); i++)
{
stripCharts[SC_Info[i].getIndex()] = new VisItSimStripChart(this,winX,winY);
QScrollArea *sc = new QScrollArea(this);
......@@ -250,7 +250,7 @@ void QvisStripChartTabWidget::setTabLabel(int tabIndex, const QString &newLabel)
int QvisStripChartTabWidget::nameToIndex(const QString &SC_Name) const
{
int ST_Index = -1;
for (size_t i = 0; i < SC_Info.size(); i++)
for (int i = 0; i < SC_Info.size(); i++)
{
if (SC_Name == tabText(i))
ST_Index = i;
......@@ -281,7 +281,7 @@ int QvisStripChartTabWidget::nameToIndex(const QString &SC_Name) const
int
QvisStripChartTabWidget::nameToTabIndex(const QString &Tab_Name) const
{
for (size_t i = 0; i < SC_Info.size(); i++)
for (int i = 0; i < SC_Info.size(); i++)
{
if(SC_Info[i].getTabName() == Tab_Name)
return i;
......
......@@ -340,7 +340,7 @@ QvisVisItUpdate::cleanUp()
// Delete all of the files in the files list.
QDir dir;
for(size_t i = 0; i < files.count(); ++i)
for(int i = 0; i < files.count(); ++i)
{
dir.remove(files[i]);
debug1 << "Removed " << files[i].toStdString() << endl;
......
......@@ -124,9 +124,6 @@
/* Define to 1 if you have the `memmove' function. */
#cmakedefine HAVE_MEMMOVE 1
/* Define to 1 if you have the `strerror' function. */
#cmakedefine HAVE_STRERROR 1
/* Define to 1 if you have the `div' function. */
#cmakedefine HAVE_DIV 1
......
......@@ -1121,10 +1121,9 @@ LauncherApplication::ConnectSimulation(const stringVector &origLaunchArgs,
struct hostent *hp;
struct sockaddr_in server;
stringVector launchArgs;
size_t i;
debug1 << mName << "origLaunchArgs={";
for(int i = 0; i < origLaunchArgs.size(); ++i)
for(size_t i = 0; i < origLaunchArgs.size(); ++i)
debug1 << origLaunchArgs[i] << " ";
debug1 << "}" << endl;
debug1 << "simHost=" << simHost << endl;
......@@ -1151,7 +1150,7 @@ LauncherApplication::ConnectSimulation(const stringVector &origLaunchArgs,
}
debug1 << mName << "AFTER -guesshost conversion: launchArgs={";
for(int i = 0; i < launchArgs.size(); ++i)
for(size_t i = 0; i < launchArgs.size(); ++i)
debug1 << launchArgs[i] << " ";
debug1 << "}" << endl;
......@@ -1162,7 +1161,7 @@ LauncherApplication::ConnectSimulation(const stringVector &origLaunchArgs,