Commit da5f80ca authored by Francois Bertel's avatar Francois Bertel

COMP:Fixed warnings

parent dc6071b1
......@@ -29,7 +29,7 @@
#include "assert.h"
vtkCxxRevisionMacro(vtkXMLDataReader, "1.36");
vtkCxxRevisionMacro(vtkXMLDataReader, "1.37");
//----------------------------------------------------------------------------
vtkXMLDataReader::vtkXMLDataReader()
......@@ -204,7 +204,8 @@ int vtkXMLDataReader::SetUpdateExtentInfo(vtkXMLDataElement *eDSA,
}
//----------------------------------------------------------------------------
void vtkXMLDataReader::CopyOutputInformation(vtkInformation *outInfo, int port)
void vtkXMLDataReader::CopyOutputInformation(vtkInformation *outInfo,
int vtkNotUsed(port))
{
vtkInformation *localInfo = this->GetCurrentOutputInformation();
if ( localInfo->Has(vtkDataObject::POINT_DATA_VECTOR()) )
......@@ -391,7 +392,7 @@ void vtkXMLDataReader::SetupOutputData()
for(int i=0; i<this->NumberOfPointArrays;i++)
{
this->PointDataTimeStep[i] = -1;
this->PointDataOffset[i] = (unsigned long)-1;
this->PointDataOffset[i] = static_cast<unsigned long>(-1);
}
}
if( this->NumberOfCellArrays )
......@@ -409,7 +410,7 @@ void vtkXMLDataReader::SetupOutputData()
for(int i=0; i<this->NumberOfCellArrays;i++)
{
this->CellDataTimeStep[i] = -1;
this->CellDataOffset[i] = (unsigned long)-1;
this->CellDataOffset[i] = static_cast<unsigned long>(-1);
}
}
}
......
......@@ -28,7 +28,7 @@
#include <vtksys/ios/sstream>
vtkCxxRevisionMacro(vtkXMLPDataReader, "1.20");
vtkCxxRevisionMacro(vtkXMLPDataReader, "1.21");
//----------------------------------------------------------------------------
vtkXMLPDataReader::vtkXMLPDataReader()
......@@ -212,7 +212,8 @@ void vtkXMLPDataReader::SetupOutputInformation(vtkInformation *outInfo)
//----------------------------------------------------------------------------
void vtkXMLPDataReader::CopyOutputInformation(vtkInformation *outInfo, int port)
void vtkXMLPDataReader::CopyOutputInformation(vtkInformation *outInfo,
int vtkNotUsed(port))
{
vtkInformation *localInfo = this->GetCurrentOutputInformation();
if ( localInfo->Has(vtkDataObject::POINT_DATA_VECTOR()) )
......
......@@ -26,7 +26,7 @@
#include <vtksys/ios/sstream>
vtkCxxRevisionMacro(vtkXMLPStructuredDataReader, "1.24");
vtkCxxRevisionMacro(vtkXMLPStructuredDataReader, "1.25");
//----------------------------------------------------------------------------
vtkXMLPStructuredDataReader::vtkXMLPStructuredDataReader()
......@@ -188,7 +188,6 @@ int
vtkXMLPStructuredDataReader::ReadPrimaryElement(vtkXMLDataElement* ePrimary)
{
if(!this->Superclass::ReadPrimaryElement(ePrimary)) { return 0; }
vtkDataSet* output = vtkDataSet::SafeDownCast(this->GetCurrentOutput());
// Get the whole extent attribute.
int extent[6];
......
......@@ -24,7 +24,7 @@
#include <assert.h>
vtkCxxRevisionMacro(vtkXMLPolyDataReader, "1.11");
vtkCxxRevisionMacro(vtkXMLPolyDataReader, "1.12");
vtkStandardNewMacro(vtkXMLPolyDataReader);
//----------------------------------------------------------------------------
......@@ -41,13 +41,13 @@ vtkXMLPolyDataReader::vtkXMLPolyDataReader()
// TimeStep
this->VertsTimeStep = -1;
this->VertsOffset = (unsigned long)-1;
this->VertsOffset = static_cast<unsigned long>(-1);
this->LinesTimeStep = -1;
this->LinesOffset = (unsigned long)-1;
this->LinesOffset = static_cast<unsigned long>(-1);
this->StripsTimeStep = -1;
this->StripsOffset = (unsigned long)-1;
this->StripsOffset = static_cast<unsigned long>(-1);
this->PolysTimeStep = -1;
this->PolysOffset = (unsigned long)-1;
this->PolysOffset = static_cast<unsigned long>(-1);
}
//----------------------------------------------------------------------------
......
......@@ -33,7 +33,7 @@
#include <sys/stat.h>
#include <assert.h>
vtkCxxRevisionMacro(vtkXMLReader, "1.50");
vtkCxxRevisionMacro(vtkXMLReader, "1.51");
//-----------------------------------------------------------------------------
static void ReadStringVersion(const char* version, int& major, int& minor)
{
......@@ -432,7 +432,7 @@ int vtkXMLReader
}
//----------------------------------------------------------------------------
int vtkXMLReader::RequestData(vtkInformation *request,
int vtkXMLReader::RequestData(vtkInformation *vtkNotUsed(request),
vtkInformationVector **vtkNotUsed(inputVector),
vtkInformationVector *outputVector)
{
......
......@@ -25,7 +25,7 @@
#include <assert.h>
vtkCxxRevisionMacro(vtkXMLUnstructuredDataReader, "1.29");
vtkCxxRevisionMacro(vtkXMLUnstructuredDataReader, "1.30");
//----------------------------------------------------------------------------
vtkXMLUnstructuredDataReader::vtkXMLUnstructuredDataReader()
......@@ -36,7 +36,7 @@ vtkXMLUnstructuredDataReader::vtkXMLUnstructuredDataReader()
this->TotalNumberOfCells = 0;
this->PointsTimeStep = -1; //invalid state
this->PointsOffset = (unsigned long)-1;
this->PointsOffset = static_cast<unsigned long>(-1);
}
//----------------------------------------------------------------------------
......
......@@ -25,7 +25,7 @@
#include <assert.h>
vtkCxxRevisionMacro(vtkXMLUnstructuredGridReader, "1.15");
vtkCxxRevisionMacro(vtkXMLUnstructuredGridReader, "1.16");
vtkStandardNewMacro(vtkXMLUnstructuredGridReader);
//----------------------------------------------------------------------------
......@@ -34,7 +34,7 @@ vtkXMLUnstructuredGridReader::vtkXMLUnstructuredGridReader()
this->CellElements = 0;
this->NumberOfCells = 0;
this->CellsTimeStep = -1;
this->CellsOffset = (unsigned long)-1; //almost invalid state
this->CellsOffset = static_cast<unsigned long>(-1); // almost invalid state
}
//----------------------------------------------------------------------------
......
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