Commit b3c1b20b authored by hrchilds's avatar hrchilds

Check in confirmations for -Wall changes.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23680 18c085ea-50e0-402c-830e-de6fd14e8384
parent c31da1a7
......@@ -632,7 +632,6 @@ avtSILRestriction::EnsureRestrictionCorrectness()
// by turning on enum sets, even though the TurnBoolSet
// calls will update the useSet vector.
//intVector enum_indices;
for (size_t i = 0 ; i < mapsOut.size(); i++)
{
avtSILCollection_p coll = GetSILCollection(mapsOut[i]);
......
......@@ -189,7 +189,7 @@ class ValueRetriever
{
public:
virtual double GetValue(int) = 0;
virtual ~ValueRetriever() {} /// TODO: check remove warning on deleting non virtual destructor
virtual ~ValueRetriever() { ; };
};
class VariableValueRetriever : public ValueRetriever
......
......@@ -166,7 +166,7 @@ class ValueRetriever
{
public:
virtual double GetValue(int) = 0;
virtual ~ValueRetriever() {}
virtual ~ValueRetriever() { ; };
};
class VariableValueRetriever : public ValueRetriever
......
......@@ -437,7 +437,7 @@ avtSILGenerator::AddGroups(avtSIL *sil, int top, int numGroups, int origin,
{
char name[1024];
if (!gNames.empty() && gNames.size() == (size_t)numGroups)
strcpy(name, gNames[i].c_str()); //sprintf(name, gNames[i].c_str());
strcpy(name, gNames[i].c_str());
else if (strstr(piece.c_str(), "%") != NULL)
sprintf(name, piece.c_str(), i+origin);
else
......
......@@ -1695,8 +1695,6 @@ avtTransformManager::CSGToDiscrete(avtDatabaseMetaData *md,
nZBlocks = 1;
#endif
//int nBlocks = nXBlocks * nYBlocks * nZBlocks;
int deltaX = (nX + nXBlocks - 1) / nXBlocks;
int deltaY = (nY + nYBlocks - 1) / nYBlocks;
int deltaZ = (nZ + nZBlocks - 1) / nZBlocks;
......
......@@ -237,7 +237,6 @@ avtIsenburgSGG::StreamDataset(vtkDataSet *ds)
Ghost3Dblock *block = blocks + curBlock;
int origin_out[3];
int size_out[3];
//int sz = ds->GetNumberOfPoints();
vtkDataArray *in_array = rg_in->GetPointData()->GetScalars();
void *data = in_array->GetVoidPointer(0);
......
......@@ -534,8 +534,6 @@ BoundaryHelperFunctions<T>::CommunicateBoundaryData(const vector<int> &domain2pr
#ifdef PARALLEL
MPI_Datatype mpi_datatype = GetMPIDataType<T>();
//int mpiMsgTag = GetUniqueMessageTag();
int rank;
MPI_Comm_rank(VISIT_MPI_COMM, &rank);
......@@ -743,7 +741,6 @@ BoundaryHelperFunctions<T>::CommunicateMixedBoundaryData(const vector<int> &doma
{
Neighbor *n1 = &bi->neighbors[n];
int d2 = n1->domain;
//int mi = n1->match;
if (domain2proc[d1] != domain2proc[d2])
{
......@@ -774,7 +771,6 @@ BoundaryHelperFunctions<T>::CommunicateMixedBoundaryData(const vector<int> &doma
{
Neighbor *n1 = &bi->neighbors[n];
int d2 = n1->domain;
//int mi = n1->match;
int size = bndmixlen[d1][n];
if (domain2proc[d1] != domain2proc[d2])
......
......@@ -1907,7 +1907,6 @@ avtUnstructuredDomainBoundaries::CommunicateMixvarInformation(
if (index < 0)
continue;
//avtMaterial *givingMat = mats[i];
avtMixedVariable *givingVar = mixvars[i];
size_t nCells = givenCells[index].size();
......@@ -1961,7 +1960,6 @@ avtUnstructuredDomainBoundaries::CommunicateMixvarInformation(
if (matlist[cell] < 0)
{
int current = -matlist[cell]-1;
//int nmats = 0;
do
{
vals[sendDom][recvDom][nMixlen++] = buff[current];
......@@ -2014,7 +2012,6 @@ avtUnstructuredDomainBoundaries::CommunicateMixvarInformation(
if (domainNum[i] == sendDom)
break;
//avtMaterial *givingMat = mats[i];
avtMixedVariable *givingVar = mixvars[i];
int nCells = givenCells[index].size();
......@@ -2070,7 +2067,6 @@ avtUnstructuredDomainBoundaries::CommunicateMixvarInformation(
if (matlist[cell] < 0)
{
int current = -matlist[cell]-1;
//int nmats = 0;
do
{
sendBuff[nMixlen++] = buff[current];
......@@ -2237,7 +2233,6 @@ avtUnstructuredDomainBoundaries::CommunicateMaterialInformation(
const int *mix_mat = givingMat->GetMixMat();
const float *mix_vf = givingMat->GetMixVF();
//const int *mix_zone = givingMat->GetMixZone();
int mixcnt = 0;
for (i = 0; i < nCells; ++i)
......@@ -2372,7 +2367,6 @@ avtUnstructuredDomainBoundaries::CommunicateMaterialInformation(
const int *mix_mat = givingMat->GetMixMat();
const float *mix_vf = givingMat->GetMixVF();
//const int *mix_zone = givingMat->GetMixZone();
int mixcnt = 0;
for (i = 0; i < (size_t)nCells; ++i)
......
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