Suppress compiler warning.

diff --git a/src/PVGUI/PVGUI_DataModel.cxx b/src/PVGUI/PVGUI_DataModel.cxx
index 7917899be849bacb2a38f148a10b8a57d2cf992f..1473313fc3ab9b5b16adbf2aeb5f00879c72cad6 100644 (file)
--- a/src/PVGUI/PVGUI_DataModel.cxx
+++ b/src/PVGUI/PVGUI_DataModel.cxx
@@ -349,7 +349,7 @@ bool PVGUI_DataModel::save( QStringList& theListOfFiles)
         case 1: // Save referenced files only if this is the builtin server
           aServer = pqApplicationCore::instance()->getActiveServer();
           if (aServer)
-            isBuiltIn != aServer->isRemote();
+            isBuiltIn = !aServer->isRemote();
           if(isBuiltIn)
             {
               createAndCheckRestoreFlag(aTmpDir, theListOfFiles, unused);

diff --git a/src/Plugins/ArrayRenamer/pqArraysEditorPropertyWidget.cxx b/src/Plugins/ArrayRenamer/pqArraysEditorPropertyWidget.cxx
index 2de62af5dc22387418bdcaf1b887137b988c7e93..a7b526bde6f94fc0264d7448ca68c9c780bfe28f 100644 (file)
--- a/src/Plugins/ArrayRenamer/pqArraysEditorPropertyWidget.cxx
+++ b/src/Plugins/ArrayRenamer/pqArraysEditorPropertyWidget.cxx
@@ -181,6 +181,7 @@ public:
       emit dataChanged( index( 1, min ) , index( 1, max ) );
       return true;
     }
+    return Superclass::setData(idx,value,role);
   }
 
   //------------------------------------------------------------------
@@ -357,6 +358,7 @@ public:
        return true;
       }
     }
+    return Superclass::setData(idx,value,role);
   }
 
   //------------------------------------------------------------------

diff --git a/src/Plugins/JSONReader/ParaViewPlugin/vtkJSONReader.cxx b/src/Plugins/JSONReader/ParaViewPlugin/vtkJSONReader.cxx
index 0d450c365e9b05a9b2aba7de3e403472285f2fca..70e84ad0dac03b160bcbd6473359ecd0f60f28e7 100644 (file)
--- a/src/Plugins/JSONReader/ParaViewPlugin/vtkJSONReader.cxx
+++ b/src/Plugins/JSONReader/ParaViewPlugin/vtkJSONReader.cxx
@@ -156,7 +156,7 @@ int vtkJSONReader::RequestData(vtkInformation*,
     return 0;
 
   try {
-    return this->Parse(root, output_table);
+    this->Parse(root, output_table);
     return 1;
   } 
   catch(vtkJSONException e)  {
@@ -213,7 +213,7 @@ int vtkJSONReader::CanParseFile(const char *fname, Json::Value &root)
 }
 
 //---------------------------------------------------
-int vtkJSONReader::Parse(Json::Value& root, vtkTable *table) {
+void vtkJSONReader::Parse(Json::Value& root, vtkTable *table) {
   bool hasShortNames = false;
   bool hasUnits = false;
   Container container;

diff --git a/src/Plugins/JSONReader/ParaViewPlugin/vtkJSONReader.h b/src/Plugins/JSONReader/ParaViewPlugin/vtkJSONReader.h
index 66badcfdaaa7b4b8fa755d42e27eaf7d12bd5af0..2a75aeeecd691077dde37d3b6bb5de3d1795b5e5 100644 (file)
--- a/src/Plugins/JSONReader/ParaViewPlugin/vtkJSONReader.h
+++ b/src/Plugins/JSONReader/ParaViewPlugin/vtkJSONReader.h
@@ -55,9 +55,11 @@ public:
   virtual int RequestData(vtkInformation*, 
                          vtkInformationVector**,
                          vtkInformationVector*);
+
+protected:
   // Decription:
   // Parse the Json Value corresponding to the root data from the file
-  virtual int Parse(Json::Value& root, vtkTable *theTable);
+  virtual void Parse(Json::Value& root, vtkTable *theTable);
 
   // Decription:
   // Verify if file exists and can be read by the parser

diff --git a/src/Plugins/MEDReader/IO/MEDFileFieldRepresentationTree.cxx b/src/Plugins/MEDReader/IO/MEDFileFieldRepresentationTree.cxx
index 4d3c82bd8bda011c0b10b231bcb95ad84ddf78f7..87d4837deb13aafa0ef42142ed0b4e083b9967de 100644 (file)
--- a/src/Plugins/MEDReader/IO/MEDFileFieldRepresentationTree.cxx
+++ b/src/Plugins/MEDReader/IO/MEDFileFieldRepresentationTree.cxx
@@ -175,6 +175,7 @@ vtkIdTypeArray *ELGACmp::createNew(const ParaMEDMEM::MEDFileFieldGlobsReal *glob
   _loc_names=locNames;
   _elgas=elgas;
   _defs.push_back(defs);
+  return elga;
 }
 
 void ELGACmp::appendELGAIfAny(vtkDataSet *ds) const