Commit d27765dd authored by bonnell's avatar bonnell

Warning cleanup

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23711 18c085ea-50e0-402c-830e-de6fd14e8384
parent e6ccfc8e
......@@ -290,7 +290,6 @@ avtOpenFOAMFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md,
for (it = meshPatchMap.begin(); it != meshPatchMap.end(); ++it)
{
string root(it->first);
//size_t nB = it->second.size();
avtMeshMetaData *mmd = new avtMeshMetaData;
mmd->meshType = AVT_UNSTRUCTURED_MESH;
......
......@@ -4663,7 +4663,7 @@ vtkFloatArray* visit_vtkOpenFOAMReaderPrivate::ReadPointsFile()
dict.ReadNonuniformList<vtkFoamToken::VECTORLIST,
vtkFoamEntryValue::vectorListTraits<vtkFloatArray, float, 3, false> >(io);
}
catch(vtkFoamError& e)
catch(vtkFoamError &e)
{
vtkDebugMacro(<<"Error reading line " << io.GetLineNumber()
<< " of " << io.GetFileName().c_str() << ": " << e.c_str());
......@@ -4706,7 +4706,7 @@ vtkFoamIntVectorVector * visit_vtkOpenFOAMReaderPrivate::ReadFacesFile(
dict.ReadLabelListList(io);
}
}
catch(vtkFoamError& e)
catch(vtkFoamError &e)
{
vtkDebugMacro(<<"Error reading line " << io.GetLineNumber()
<< " of " << io.GetFileName().c_str() << ": " << e.c_str());
......@@ -4730,7 +4730,7 @@ vtkFoamIntVectorVector * visit_vtkOpenFOAMReaderPrivate::ReadOwnerNeighborFiles(
ownerDict.ReadNonuniformList<vtkFoamToken::LABELLIST,
vtkFoamEntryValue::listTraits<vtkIntArray, int> >(io);
}
catch(vtkFoamError& e)
catch(vtkFoamError &e)
{
vtkDebugMacro(<<"Error reading line " << io.GetLineNumber()
<< " of " << io.GetFileName().c_str() << ": " << e.c_str());
......@@ -4753,7 +4753,7 @@ vtkFoamIntVectorVector * visit_vtkOpenFOAMReaderPrivate::ReadOwnerNeighborFiles(
neighborDict.ReadNonuniformList<vtkFoamToken::LABELLIST,
vtkFoamEntryValue::listTraits<vtkIntArray, int> >(io);
}
catch(vtkFoamError& e)
catch(vtkFoamError &e)
{
vtkDebugMacro(<<"Error reading line " << io.GetLineNumber()
<< " of " << io.GetFileName().c_str() << ": " << e.c_str());
......@@ -4916,7 +4916,7 @@ vtkFoamIntVectorVector * visit_vtkOpenFOAMReaderPrivate::ReadOwnerNeighborFiles(
{
cellsDict.ReadLabelListList(io);
}
catch(vtkFoamError& e)
catch(vtkFoamError &e)
{
vtkDebugMacro(<<"Error reading line " << io.GetLineNumber()
<< " of " << io.GetFileName().c_str() << ": " << e.c_str());
......@@ -6551,7 +6551,6 @@ vtkFloatArray *visit_vtkOpenFOAMReaderPrivate::FillField(vtkFoamEntry *entryPtr,
{
vtkFloatArray *data;
vtkFoamEntry &entry = *entryPtr;
const vtkStdString &className = ioPtr->GetClassName(); (void) className;
// "uniformValue" keyword is for uniformFixedValue B.C.
if (entry.FirstValue().GetIsUniform() || entry.GetKeyword() == "uniformValue")
......@@ -6621,7 +6620,8 @@ vtkFloatArray *visit_vtkOpenFOAMReaderPrivate::FillField(vtkFoamEntry *entryPtr,
else
{
vtkDebugMacro(<< "Number of components and field class doesn't match "
<< "for " << ioPtr->GetFileName().c_str() << ". class = " << className.c_str()
<< "for " << ioPtr->GetFileName().c_str()
<< ". class = " << ioPtr->GetClassName().c_str()
<< ", nComponents = " << nComponents);
return NULL;
}
......@@ -7316,7 +7316,7 @@ vtkMultiBlockDataSet* visit_vtkOpenFOAMReaderPrivate::MakeLagrangianMesh()
vtkFoamEntryValue::vectorListTraits<vtkFloatArray, float, 3, true> >(
io);
}
catch(vtkFoamError& e)
catch(vtkFoamError &e)
{
vtkDebugMacro(<<"Error reading line " << io.GetLineNumber()
<< " of " << io.GetFileName().c_str() << ": " << e.c_str());
......
......@@ -398,7 +398,7 @@ void visit_vtkPOpenFOAMReader::GatherMetaData()
// Broadcast a vtkStringArray in process 0 to all processes
void visit_vtkPOpenFOAMReader::Broadcast(vtkStringArray *sa)
{
vtkIdType lengths[2] = {0,0}; //TODO: check on fix for uninitialized pointer
vtkIdType lengths[2] = {0,0};
if (this->ProcessId == 0)
{
lengths[0] = sa->GetNumberOfTuples();
......
......@@ -632,7 +632,7 @@ avtRectFileFormat::ReadVizFile(ifstream &in)
for (i=0; i<ndomains; i++)
{
if (i == 0 && (buff == "curv" || buff == "rect") || i > 0)
if ((i == 0 && (buff == "curv" || buff == "rect")) || i > 0)
in >> buff; // for "domainIJK" token
int x,y,z;
in >> x >> y >> z;
......
......@@ -41,7 +41,7 @@
// ************************************************************************* //
#ifndef AVT_WAVEFRONT_OBJ_FILE_FORMAT_H
#define AVT_WAVEFRONt_OBJ_FILE_FORMAT_H
#define AVT_WAVEFRONT_OBJ_FILE_FORMAT_H
#include <avtSTSDFileFormat.h>
......
......@@ -41,7 +41,7 @@
// ************************************************************************* //
#ifndef AVT_POLARTOCARTESIAN_FILTER_H
#define AVT_POALRTOCARTESIAN_FILTER_H
#define AVT_POLARTOCARTESIAN_FILTER_H
#include <avtDataTreeIterator.h>
......
......@@ -261,7 +261,7 @@ avtStreamlineRenderer::SetAtts(const AttributeGroup *a)
// ****************************************************************************
void
avtStreamlineRenderer::GlobalSetAmbientCoefficient(float coeff)
avtStreamlineRenderer::GlobalSetAmbientCoefficient(double coeff)
{
ambient_coeff = coeff;
}
......
......@@ -95,7 +95,7 @@ class avtStreamlineRenderer : public avtCustomRenderer
// lighting props
virtual void GlobalLightingOn();
virtual void GlobalLightingOff();
virtual void GlobalSetAmbientCoefficient(const float);
virtual void GlobalSetAmbientCoefficient(const double);
virtual void SetSpecularProperties(bool,double,double,
const ColorAttribute&);
......
......@@ -125,7 +125,7 @@ vtkQtImagePrinter::vtkQtImagePrinter() : print()
// ****************************************************************************
void
vtkQtImagePrinter::WriteFile(ofstream *, vtkImageData *data, int extent[6])
vtkQtImagePrinter::WriteFile(ofstream *, vtkImageData *data, int extent[6], int [6])
{
// Make sure that data is not NULL.
if(data == NULL)
......
......@@ -74,8 +74,8 @@ protected:
vtkQtImagePrinter(const vtkQtImagePrinter&) {};
void operator=(const vtkQtImagePrinter&) {};
virtual void WriteFile(ofstream *file, vtkImageData *data, int ext[6]);
virtual void WriteFileHeader(ofstream *, vtkImageData *) { };
virtual void WriteFile(ofstream *file, vtkImageData *data, int ext[6], int wext[6]);
virtual void WriteFileHeader(ofstream *, vtkImageData *, int [6]) { };
private:
QPrinter print;
};
......
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