Fix various compiler warnings with CGNS reader.

Kitware · Mar 29, 2017 · cd8aaee · cd8aaee
1 parent ff4a159
commit cd8aaee
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 55 deletions.
diff --git a/ParaViewCore/VTKExtensions/CGNSReader/Testing/Cxx/TestCGNSReader.cxx b/ParaViewCore/VTKExtensions/CGNSReader/Testing/Cxx/TestCGNSReader.cxx
@@ -30,7 +30,7 @@
 
 int TestOutput(vtkMultiBlockDataSet* mb, int nCells, VTKCellType type)
 {
-  int nBlocks = mb->GetNumberOfBlocks();
+  unsigned int nBlocks = mb->GetNumberOfBlocks();
   vtk_assert(nBlocks > 0);
   for (unsigned int i = 0; i < nBlocks; ++i)
   {

diff --git a/ParaViewCore/VTKExtensions/CGNSReader/Testing/Cxx/TestReadCGNSSolution.cxx b/ParaViewCore/VTKExtensions/CGNSReader/Testing/Cxx/TestReadCGNSSolution.cxx
@@ -34,7 +34,7 @@ int TestOutput(vtkMultiBlockDataSet* mb, int nCells, VTKCellType type);
 
 int TestOutputData(vtkMultiBlockDataSet* mb, int nCells, int nArrays)
 {
-  int nBlocks = mb->GetNumberOfBlocks();
+  unsigned int nBlocks = mb->GetNumberOfBlocks();
   vtk_assert(nBlocks > 0);
   for (unsigned int i = 0; i < nBlocks; ++i)
   {
@@ -64,14 +64,10 @@ int TestReadCGNSSolution(int argc, char* argv[])
 
   const char* solution = argv[2];
   vtkNew<vtkCGNSReader> reader;
-  vtkInformation* inf = reader->GetInformation();
-
   reader->SetFileName(solution);
-  reader->Update();
-
+  reader->UpdateInformation();
   reader->EnableAllCellArrays();
   reader->EnableAllPointArrays();
-
   reader->Update();
 
   vtkMultiBlockDataSet* mb = reader->GetOutput();

diff --git a/ParaViewCore/VTKExtensions/CGNSReader/vtkCGNSReader.cxx b/ParaViewCore/VTKExtensions/CGNSReader/vtkCGNSReader.cxx
@@ -1168,7 +1168,7 @@ int vtkCGNSReader::GetUnstructuredZone(
   //---------------------------------------------------------------------
   // Read the number of sections, for the zone.
   int nsections = 0;
-  nsections = elemIdList.size();
+  nsections = static_cast<int>(elemIdList.size());
 
   std::vector<SectionInformation> sectionInfoList(nsections);
 
@@ -1741,7 +1741,7 @@ int vtkCGNSReader::GetUnstructuredZone(
     mzone->SetBlock(0, ugrid);
     ugrid->Delete();
     vtkMultiBlockDataSet* mpatch = vtkMultiBlockDataSet::New();
-    mpatch->SetNumberOfBlocks(bndSec.size());
+    mpatch->SetNumberOfBlocks(static_cast<unsigned int>(bndSec.size()));
 
     int bndNum = 0;
     for (std::vector<int>::iterator iter = bndSec.begin(); iter != bndSec.end(); ++iter)
@@ -2128,7 +2128,7 @@ int vtkCGNSReader::RequestData(vtkInformation* vtkNotUsed(request),
   nSelectedBases = this->BaseSelection->GetNumberOfArraysEnabled();
   rootNode->SetNumberOfBlocks(nSelectedBases);
   blockIndex = 0;
-  for (int numBase = 0; numBase < baseIds.size(); numBase++)
+  for (int numBase = 0; numBase < static_cast<int>(baseIds.size()); numBase++)
   {
     int cellDim = 0;
     int physicalDim = 0;
@@ -2367,7 +2367,7 @@ int vtkCGNSReader::RequestData(vtkInformation* vtkNotUsed(request),
 }
 
 //------------------------------------------------------------------------------
-int vtkCGNSReader::RequestInformation(vtkInformation* request,
+int vtkCGNSReader::RequestInformation(vtkInformation* vtkNotUsed(request),
   vtkInformationVector** vtkNotUsed(inputVector), vtkInformationVector* outputVector)
 {
 

diff --git a/ParaViewCore/VTKExtensions/CGNSReader/vtkCGNSReader.h b/ParaViewCore/VTKExtensions/CGNSReader/vtkCGNSReader.h
@@ -53,7 +53,7 @@ class VTKPVVTKEXTENSIONSCGNSREADER_EXPORT vtkCGNSReader : public vtkMultiBlockDa
 public:
   static vtkCGNSReader* New();
   vtkTypeMacro(vtkCGNSReader, vtkMultiBlockDataSetAlgorithm);
-  void PrintSelf(ostream& os, vtkIndent indent);
+  void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
 
   //@{
   /**
@@ -150,10 +150,10 @@ class VTKPVVTKEXTENSIONSCGNSREADER_EXPORT vtkCGNSReader : public vtkMultiBlockDa
   vtkCGNSReader();
   ~vtkCGNSReader();
 
-  virtual int FillOutputPortInformation(int port, vtkInformation* info);
-
-  virtual int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*);
-  virtual int RequestInformation(vtkInformation*, vtkInformationVector**, vtkInformationVector*);
+  int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+  int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+  int RequestInformation(
+    vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
 
   vtkDataArraySelection* BaseSelection;
   vtkDataArraySelection* PointDataArraySelection;

diff --git a/ParaViewCore/VTKExtensions/CGNSReader/vtkCGNSReaderInternal.cxx b/ParaViewCore/VTKExtensions/CGNSReader/vtkCGNSReaderInternal.cxx
@@ -315,40 +315,40 @@ int GetVTKElemType(
 //                                  16,17,18,19,20,21,22,23,24,25,26};
 
 // CGNS --> VTK ordering of Elements
-static const int NODE_ToVTK[1] = { 0 };
-
-static const int BAR_2_ToVTK[2] = { 0, 1 };
-
-static const int BAR_3_ToVTK[3] = { 0, 1, 2 };
-
-static const int BAR_4_ToVTK[4] = { 0, 1, 2, 3 };
-
-static const int TRI_3_ToVTK[3] = { 0, 1, 2 };
-
-static const int TRI_6_ToVTK[6] = { 0, 1, 2, 3, 4, 5 };
-
-static const int QUAD_4_ToVTK[4] = { 0, 1, 2, 3 };
-
-static const int QUAD_8_ToVTK[8] = { 0, 1, 2, 3, 4, 5, 6, 7 };
-
-static const int QUAD_9_ToVTK[9] = { 0, 1, 2, 3, 4, 5, 6, 7, 8 };
-
-static const int TETRA_4_ToVTK[4] = { 0, 1, 2, 3 };
-
-static const int TETRA_10_ToVTK[10] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-
-static const int PYRA_5_ToVTK[5] = { 0, 1, 2, 3, 4 };
-
-static const int PYRA_14_ToVTK[14] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 };
-
-static const int PENTA_6_ToVTK[6] = { 0, 1, 2, 3, 4, 5 };
+// static const int NODE_ToVTK[1] = { 0 };
+//
+// static const int BAR_2_ToVTK[2] = { 0, 1 };
+//
+// static const int BAR_3_ToVTK[3] = { 0, 1, 2 };
+//
+// static const int BAR_4_ToVTK[4] = { 0, 1, 2, 3 };
+//
+// static const int TRI_3_ToVTK[3] = { 0, 1, 2 };
+//
+// static const int TRI_6_ToVTK[6] = { 0, 1, 2, 3, 4, 5 };
+//
+// static const int QUAD_4_ToVTK[4] = { 0, 1, 2, 3 };
+//
+// static const int QUAD_8_ToVTK[8] = { 0, 1, 2, 3, 4, 5, 6, 7 };
+//
+// static const int QUAD_9_ToVTK[9] = { 0, 1, 2, 3, 4, 5, 6, 7, 8 };
+//
+// static const int TETRA_4_ToVTK[4] = { 0, 1, 2, 3 };
+//
+// static const int TETRA_10_ToVTK[10] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+//
+// static const int PYRA_5_ToVTK[5] = { 0, 1, 2, 3, 4 };
+//
+// static const int PYRA_14_ToVTK[14] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 };
+//
+// static const int PENTA_6_ToVTK[6] = { 0, 1, 2, 3, 4, 5 };
 
 static const int PENTA_15_ToVTK[15] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 12, 13, 14, 9, 10, 11 };
 
 static const int PENTA_18_ToVTK[18] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 12, 13, 14, 9, 10, 11, 15, 16,
   17 };
 
-static const int HEXA_8_ToVTK[8] = { 0, 1, 2, 3, 4, 5, 6, 7 };
+// static const int HEXA_8_ToVTK[8] = { 0, 1, 2, 3, 4, 5, 6, 7 };
 
 static const int HEXA_20_ToVTK[20] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 16, 17, 18, 19, 12, 13,
   14, 15 };
@@ -853,7 +853,7 @@ static void BroadcastSelection(
       CGNSRead::BroadcastString(controller, key, rank);
       selection[key] = false;
       controller->Broadcast(&tmp, 1, 0);
-      selection[key] = (bool)tmp;
+      selection[key] = (tmp != 0);
     }
   }
 }

diff --git a/ParaViewCore/VTKExtensions/CGNSReader/vtkCGNSReaderInternal.h b/ParaViewCore/VTKExtensions/CGNSReader/vtkCGNSReaderInternal.h
@@ -274,16 +274,6 @@ class vtkCGNSMetaData
   std::vector<double> GlobalTime;
 };
 
-//------------------------------------------------------------------------------
-// sort variables by name helper function
-static int sortVariablesByName(const void* vOne, const void* vTwo)
-{
-  Variable* varOne = (Variable*)vOne;
-  Variable* varTwo = (Variable*)vTwo;
-
-  return (strcmp(varOne->name, varTwo->name));
-}
-
 //------------------------------------------------------------------------------
 // compare name return true if name1 == name2
 inline bool compareName(const char_33 nameOne, const char_33 nameTwo)