From: Viktor UZLOV Date: Tue, 1 Sep 2020 09:29:02 +0000 (+0300) Subject: #18963 Minimize compiler warnings X-Git-Tag: V9_7_0a1~14 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=76595daea917b39a1c29b3cf79d0ae95e27ab032;p=modules%2Fparavis.git #18963 Minimize compiler warnings --- diff --git a/doc/doxygen/doxyfile.in b/doc/doxygen/doxyfile.in index a26830ad..3d06c684 100644 --- a/doc/doxygen/doxyfile.in +++ b/doc/doxygen/doxyfile.in @@ -1942,7 +1942,7 @@ ENABLE_PREPROCESSING = YES # The default value is: NO. # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. -MACRO_EXPANSION = NO +MACRO_EXPANSION = YES # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then # the macro expansion is limited to the macros specified with the PREDEFINED and @@ -1950,7 +1950,7 @@ MACRO_EXPANSION = NO # The default value is: NO. # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. -EXPAND_ONLY_PREDEF = NO +EXPAND_ONLY_PREDEF = YES # If the SEARCH_INCLUDES tag is set to YES the includes files in the # INCLUDE_PATH will be searched if a #include is found. @@ -1982,7 +1982,8 @@ INCLUDE_FILE_PATTERNS = # recursively expanded use the := operator instead of the = operator. # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. -PREDEFINED = +PREDEFINED = vtkTypeMacro()= \ + vtkStandardNewMacro()= # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this # tag can be used to specify a list of macro names that should be expanded. The @@ -2310,7 +2311,7 @@ PLANTUML_JAR_PATH = # Minimum value: 0, maximum value: 10000, default value: 50. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_GRAPH_MAX_NODES = 50 +DOT_GRAPH_MAX_NODES = 100 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs # generated by dot. A depth value of 3 means that only nodes reachable from the diff --git a/src/Insitu/VisualizationComponent/VisualizationComponent.cxx b/src/Insitu/VisualizationComponent/VisualizationComponent.cxx index 36bfec5c..9b2547b1 100644 --- a/src/Insitu/VisualizationComponent/VisualizationComponent.cxx +++ b/src/Insitu/VisualizationComponent/VisualizationComponent.cxx @@ -115,7 +115,7 @@ void VisualizationComponent_i::Visualize(SALOME_MED::ParaMEDCouplingFieldDoubleC { beginService("VisualizationComponent_i::Visualize"); void *ret_th; - pthread_t *th; + pthread_t *th = 0; exception_st *est; try diff --git a/src/PVGUI/PVGUI_DataModel.cxx b/src/PVGUI/PVGUI_DataModel.cxx index 2d7da3bd..5814ef1e 100644 --- a/src/PVGUI/PVGUI_DataModel.cxx +++ b/src/PVGUI/PVGUI_DataModel.cxx @@ -325,7 +325,7 @@ bool PVGUI_DataModel::createAndCheckRestoreFlag(const QString& tmpdir, QStringLi /*! \brief Save data model (write ParaView pipeline to the files). - \param listOfFiles returning list of the (temporary) files with saved data + \param theListOfFiles returning list of the (temporary) files with saved data \return operation status (\c true on success and \c false on error) */ bool PVGUI_DataModel::save( QStringList& theListOfFiles) @@ -407,10 +407,10 @@ bool PVGUI_DataModel::save( QStringList& theListOfFiles) \brief Save data model (write ParaView pipeline state to the files). \param url study file path \param study study pointer - \param listOfFiles returning list of the (temporary) files with saved data + \param theListOfFiles returning list of the (temporary) files with saved data \return operation status (\c true on success and \c false on error) */ -bool PVGUI_DataModel::saveAs( const QString& url, CAM_Study* study, QStringList& theListOfFiles) +bool PVGUI_DataModel::saveAs( const QString& url, CAM_Study* /*study*/, QStringList& theListOfFiles) { myStudyURL = url; return save( theListOfFiles ); diff --git a/src/PVGUI/PVGUI_DataModel.h b/src/PVGUI/PVGUI_DataModel.h index e16134f7..af53f423 100644 --- a/src/PVGUI/PVGUI_DataModel.h +++ b/src/PVGUI/PVGUI_DataModel.h @@ -42,7 +42,7 @@ public: virtual bool dumpPython( const QString&, CAM_Study*, bool, QStringList& ); virtual bool open( const QString&, CAM_Study*, QStringList ); virtual bool save( QStringList& ); - virtual bool saveAs( const QString&, CAM_Study*, QStringList& ); + virtual bool saveAs( const QString& url, CAM_Study* study, QStringList& theListOfFiles ); virtual bool create( CAM_Study* ); private: diff --git a/src/PVGUI/PVGUI_Module.cxx b/src/PVGUI/PVGUI_Module.cxx index 3119a5cf..08fc02d2 100644 --- a/src/PVGUI/PVGUI_Module.cxx +++ b/src/PVGUI/PVGUI_Module.cxx @@ -1000,7 +1000,7 @@ void PVGUI_Module::onViewManagerRemoved( SUIT_ViewManager* vm ) /*! \brief Show toolbars at \a vw PV view window creating when PARAVIS is active. */ -void PVGUI_Module::onPVViewCreated( SUIT_ViewWindow* vw ) +void PVGUI_Module::onPVViewCreated( SUIT_ViewWindow* /*vw*/ ) { myGuiElements->setToolBarVisible( true ); restoreDockWidgetsState(); diff --git a/src/PVGUI/PVGUI_Module_actions.cxx b/src/PVGUI/PVGUI_Module_actions.cxx index e126f5a5..a1130e43 100644 --- a/src/PVGUI/PVGUI_Module_actions.cxx +++ b/src/PVGUI/PVGUI_Module_actions.cxx @@ -409,7 +409,7 @@ void PVGUI_Module::pvCreateMenus() // Recent Files myRecentMenuId = createMenu( tr( "MEN_RECENT_FILES" ), aPVMnu, -1, 5 ); QMenu* aMenu = menuMgr()->findMenu( myRecentMenuId ); - pqRecentFilesMenu* aRecentFilesMenu = new pqRecentFilesMenu( *aMenu, getApp()->desktop() ); + /*pqRecentFilesMenu* aRecentFilesMenu = */new pqRecentFilesMenu( *aMenu, getApp()->desktop() ); QList anActns = aMenu->actions(); for (int i = 0; i < anActns.size(); ++i) createMenu( anActns.at(i), myRecentMenuId ); diff --git a/src/PVGUI/PVGUI_ParaViewSettingsPane.cxx b/src/PVGUI/PVGUI_ParaViewSettingsPane.cxx index 07cb3a11..058e9ede 100644 --- a/src/PVGUI/PVGUI_ParaViewSettingsPane.cxx +++ b/src/PVGUI/PVGUI_ParaViewSettingsPane.cxx @@ -217,7 +217,7 @@ void PVGUI_ParaViewSettingsPane::hideEvent(QHideEvent * ev) } //----------------------------------------------------------------------------- -void PVGUI_ParaViewSettingsPane::clicked(QAbstractButton *button) +void PVGUI_ParaViewSettingsPane::clicked(QAbstractButton * /*button*/) { // Ui::CustomSettingsWidget &ui = this->Internals->Ui; // QDialogButtonBox::ButtonRole role = ui.buttonBox->buttonRole(button); diff --git a/src/PVGUI/PVGUI_ParaViewSettingsPane.h b/src/PVGUI/PVGUI_ParaViewSettingsPane.h index 6eb69ea3..b62de71e 100644 --- a/src/PVGUI/PVGUI_ParaViewSettingsPane.h +++ b/src/PVGUI/PVGUI_ParaViewSettingsPane.h @@ -36,7 +36,7 @@ class LightApp_Application; /**! * This class is (almost) a copy/paste of what is found in - * */Qt/Components/pqSettingsDialog.h* + * *[PARAVIEW]/Qt/Components/pqSettingsDialog.h* * This is (almost) the same, except for the inheritance to QtxUserDefinedContent providing the link * to SALOME preference mechanism. * The UI content of pqSettingsDialog is put in a (PARAVIS) widget called pqCustomSettingsWidget. @@ -80,7 +80,7 @@ protected: void saveInQSettings(const char* key, vtkSMProperty* smproperty); private: - Q_DISABLE_COPY(PVGUI_ParaViewSettingsPane); + Q_DISABLE_COPY(PVGUI_ParaViewSettingsPane) class pqInternals; pqInternals* Internals; diff --git a/src/Plugins/ArrayRenamer/plugin/ArrayRenamerModule/vtkArrayRenamerFilter.cxx b/src/Plugins/ArrayRenamer/plugin/ArrayRenamerModule/vtkArrayRenamerFilter.cxx index a855baf6..24f07848 100644 --- a/src/Plugins/ArrayRenamer/plugin/ArrayRenamerModule/vtkArrayRenamerFilter.cxx +++ b/src/Plugins/ArrayRenamer/plugin/ArrayRenamerModule/vtkArrayRenamerFilter.cxx @@ -64,7 +64,7 @@ public: }; //------------------------------------------------------------------------------ -vtkStandardNewMacro(vtkArrayRenamerFilter); +vtkStandardNewMacro(vtkArrayRenamerFilter) //-------------------------------------------------------------------------------------------------- vtkArrayRenamerFilter::vtkArrayRenamerFilter() @@ -85,8 +85,8 @@ int vtkArrayRenamerFilter::RequestData(vtkInformation* theRequest, // std::cout<<"vtkArrayRenamerFilter::RequestData !!! "<GetInformationObject(0); - vtkInformation* anOutputInfo = theOutputVector->GetInformationObject(0); + //vtkInformation* anInputInfo = theInputVector[0]->GetInformationObject(0); // todo: unused + //vtkInformation* anOutputInfo = theOutputVector->GetInformationObject(0); // todo: unused vtkDataSet* anInput = vtkDataSet::GetData(theInputVector[0], 0); vtkDataSet* anOutput = vtkDataSet::GetData(theOutputVector, 0); diff --git a/src/Plugins/ArrayRenamer/plugin/ArrayRenamerModule/vtkArrayRenamerFilter.h b/src/Plugins/ArrayRenamer/plugin/ArrayRenamerModule/vtkArrayRenamerFilter.h index 7b58eefb..291e8bfa 100644 --- a/src/Plugins/ArrayRenamer/plugin/ArrayRenamerModule/vtkArrayRenamerFilter.h +++ b/src/Plugins/ArrayRenamer/plugin/ArrayRenamerModule/vtkArrayRenamerFilter.h @@ -33,7 +33,7 @@ public: /// Returns pointer on a new instance of the class static vtkArrayRenamerFilter* New(); - vtkTypeMacro(vtkArrayRenamerFilter, vtkDataSetAlgorithm); + vtkTypeMacro(vtkArrayRenamerFilter, vtkDataSetAlgorithm) void SetArrayInfo(const char* originarrayname, const char* newarrayname, bool copy); void ClearArrayInfo(); diff --git a/src/Plugins/ArrayRenamer/plugin/pqArraysEditorPropertyWidget.cxx b/src/Plugins/ArrayRenamer/plugin/pqArraysEditorPropertyWidget.cxx index beddbc91..057d93a4 100644 --- a/src/Plugins/ArrayRenamer/plugin/pqArraysEditorPropertyWidget.cxx +++ b/src/Plugins/ArrayRenamer/plugin/pqArraysEditorPropertyWidget.cxx @@ -168,6 +168,7 @@ public: { if (myComponentsInfoVector[idx.row()].second == myComponentsInfoVector[idx.row()].first) return QApplication::palette().color(QPalette::Disabled, QPalette::Text); + break; } case Qt::FontRole: { @@ -247,7 +248,7 @@ public: const ComponentsInfoType& componentsInfo() const { return myComponentsInfoVector; } private: - Q_DISABLE_COPY(pqComponentsModel); + Q_DISABLE_COPY(pqComponentsModel) }; /// Table model for the array's table @@ -265,10 +266,10 @@ public: public: //------------------------------------------------------------------ - const int nbComps() const { return myComponentsInfo.size(); } + int nbComps() const { return myComponentsInfo.size(); } //------------------------------------------------------------------ - const bool isCompomentsModified() const + bool isCompomentsModified() const { foreach (pqComponentsModel::SingleComponentInfoType item, myComponentsInfo) { @@ -376,6 +377,7 @@ public: { if (myArraysInfo[idx.row()].second.newName == myArraysInfo[idx.row()].first) return QApplication::palette().color(QPalette::Disabled, QPalette::Text); + break; } case Qt::FontRole: { @@ -480,11 +482,11 @@ public: ArraysInfoType& editArraysInfo() { return myArraysInfo; } private: - Q_DISABLE_COPY(pqArraysModel); + Q_DISABLE_COPY(pqArraysModel) }; //----------------------------------------------------------------------------- -pqEditComponents::pqEditComponents(pqComponentsModel* model, QWidget* parent) +pqEditComponents::pqEditComponents(pqComponentsModel* model, QWidget* /*parent*/) { myComponentsModel = model; @@ -673,7 +675,7 @@ QList pqArraysEditorPropertyWidget::componentsInfo() const //----------------------------------------------------------------------------- void pqArraysEditorPropertyWidget::onDataChanged( - const QModelIndex& topleft, const QModelIndex& btmright) + const QModelIndex& topleft, const QModelIndex& /*btmright*/) { if (topleft.column() == pqArraysModel::PROCESSING || topleft.column() == pqArraysModel::NEW_NAME) { diff --git a/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/VTKToMEDMem.cxx b/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/VTKToMEDMem.cxx index 9c424df5..847b3436 100644 --- a/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/VTKToMEDMem.cxx +++ b/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/VTKToMEDMem.cxx @@ -264,7 +264,7 @@ MEDCouplingUMesh *BuildMeshFromCellArray(vtkCellArray *ca, DataArrayDouble *coor int nbCells(ca->GetNumberOfCells()); if(nbCells==0) return 0; - vtkIdType nbEntries(ca->GetNumberOfConnectivityEntries()); + //vtkIdType nbEntries(ca->GetNumberOfConnectivityEntries()); // todo: unused const vtkIdType *conn(ca->GetData()->GetPointer(0)); for(int i=0;iGetNumberOfCells()); if(nbCells==0) return 0; - vtkIdType nbEntries(ca->GetNumberOfConnectivityEntries()); + //vtkIdType nbEntries(ca->GetNumberOfConnectivityEntries()); // todo: unused const vtkIdType *conn(ca->GetData()->GetPointer(0)); ids=DataArrayIdType::New() ; ids->alloc(0,1); for(int i=0;i mesh(mf.getMesh()); mesh->setName(mfd->getMeshes()->getMeshAtPos(0)->getName()); MCAuto o2n(mesh->sortCellsInMEDFileFrmt()); - const DataArrayIdType *o2nPtr(o2n); + //const DataArrayIdType *o2nPtr(o2n); // todo: unused MCAuto n2o; mmu->setMeshAtLevel(meshDimRel,mesh); const DataArrayIdType *n2oPtr(0); @@ -570,8 +570,8 @@ std::vector > AddPartFields(const DataArrayIdType *part, vtkDa if(!arr) continue; const char *name(arr->GetName()); - int nbCompo(arr->GetNumberOfComponents()); - vtkIdType nbTuples(arr->GetNumberOfTuples()); + //int nbCompo(arr->GetNumberOfComponents()); + //vtkIdType nbTuples(arr->GetNumberOfTuples()); // todo: unused MCAuto mcarr(ConvertVTKArrayToMCArray(arr)); if(part) mcarr=mcarr->selectByTupleId(part->begin(),part->end()); @@ -593,8 +593,8 @@ std::vector > AddPartFields2(int bg, int end, vtkDataSetAttrib if(!arr) continue; const char *name(arr->GetName()); - int nbCompo(arr->GetNumberOfComponents()); - vtkIdType nbTuples(arr->GetNumberOfTuples()); + //int nbCompo(arr->GetNumberOfComponents()); // todo: unused + //vtkIdType nbTuples(arr->GetNumberOfTuples()); // todo: unused MCAuto mcarr(ConvertVTKArrayToMCArray(arr)); mcarr=mcarr->selectByTupleIdSafeSlice(bg,end,1); mcarr->setName(name); @@ -744,13 +744,13 @@ void ConvertFromUnstructuredGrid(MEDFileData *ret, vtkUnstructuredGrid *ds, cons vtkCellArray *ca(ds->GetCells()); if(!ca) return ; - vtkIdType nbEnt(ca->GetNumberOfConnectivityEntries()); - vtkIdType *caPtr(ca->GetData()->GetPointer(0)); + //vtkIdType nbEnt(ca->GetNumberOfConnectivityEntries()); // todo: unused + //vtkIdType *caPtr(ca->GetData()->GetPointer(0)); // todo: unused vtkUnsignedCharArray *ct(ds->GetCellTypesArray()); if(!ct) throw MZCException("ConvertFromUnstructuredGrid : internal error"); vtkIdTypeArray *cla(ds->GetCellLocationsArray()); - const vtkIdType *claPtr(cla->GetPointer(0)); + //const vtkIdType *claPtr(cla->GetPointer(0)); // todo: unused if(!cla) throw MZCException("ConvertFromUnstructuredGrid : internal error 2"); const unsigned char *ctPtr(ct->GetPointer(0)); @@ -779,10 +779,9 @@ void ConvertFromUnstructuredGrid(MEDFileData *ret, vtkUnstructuredGrid *ds, cons } } } - int dummy(0); MCAuto levs(lev->getDifferentValues()); std::vector< MicroField > ms; - vtkIdTypeArray *faces(ds->GetFaces()),*faceLoc(ds->GetFaceLocations()); + //vtkIdTypeArray *faces(ds->GetFaces()),*faceLoc(ds->GetFaceLocations()); // todo: unused for(const int *curLev=levs->begin();curLev!=levs->end();curLev++) { MCAuto m0(MEDCouplingUMesh::New("",*curLev)); diff --git a/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/VTKToMEDMem.h b/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/VTKToMEDMem.h index 8256941d..19937280 100644 --- a/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/VTKToMEDMem.h +++ b/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/VTKToMEDMem.h @@ -44,8 +44,8 @@ class VTK_EXPORT MZCException : public std::exception { public: MZCException(const std::string& s):_reason(s) { } - virtual const char *what() const throw() { return _reason.c_str(); } - virtual ~MZCException() throw() { } + virtual const char *what() const noexcept { return _reason.c_str(); } + virtual ~MZCException() noexcept { } private: std::string _reason; }; diff --git a/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/vtkDevelopedSurface.cxx b/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/vtkDevelopedSurface.cxx index ea305df0..d68137f3 100644 --- a/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/vtkDevelopedSurface.cxx +++ b/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/vtkDevelopedSurface.cxx @@ -73,7 +73,7 @@ #include #include -vtkStandardNewMacro(vtkDevelopedSurface); +vtkStandardNewMacro(vtkDevelopedSurface) /////////////////// @@ -156,7 +156,7 @@ void vtkDevelopedSurface::SetThetaOffset(double offsetInDegrees) this->Modified(); } -int vtkDevelopedSurface::RequestInformation(vtkInformation *request, vtkInformationVector **inputVector, vtkInformationVector *outputVector) +int vtkDevelopedSurface::RequestInformation(vtkInformation * /*request*/, vtkInformationVector **inputVector, vtkInformationVector * /*outputVector*/) { //std::cerr << "########################################## vtkDevelopedSurface::RequestInformation ##########################################" << std::endl; try @@ -212,7 +212,7 @@ std::vector UnWrapByDuplicatingNodes(vtkCellArray *ca, vtkIdType& offs } template -void DealArray(vtkDataSetAttributes *pd, int pos, typename MEDFileVTKTraits::VtkType *arr, std::vector& nodeSel) +void DealArray(vtkDataSetAttributes * /*pd*/, int /*pos*/, typename MEDFileVTKTraits::VtkType *arr, std::vector& nodeSel) { int nbc(arr->GetNumberOfComponents()); std::size_t nbt(nodeSel.size()); @@ -431,7 +431,7 @@ void dealWith(vtkPolyData *outdata, const double center[3], const double axis[3] } } -int vtkDevelopedSurface::RequestData(vtkInformation *request, vtkInformationVector **inputVector, vtkInformationVector *outputVector) +int vtkDevelopedSurface::RequestData(vtkInformation * /*request*/, vtkInformationVector **inputVector, vtkInformationVector *outputVector) { //std::cerr << "########################################## vtkDevelopedSurface::RequestData ##########################################" << std::endl; try diff --git a/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/vtkDevelopedSurface.h b/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/vtkDevelopedSurface.h index 1491c60f..05c78107 100644 --- a/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/vtkDevelopedSurface.h +++ b/src/Plugins/DevelopedSurface/plugin/DevelopedSurfaceModule/vtkDevelopedSurface.h @@ -31,7 +31,7 @@ class vtkDevelopedSurface : public vtkDataSetAlgorithm { public: static vtkDevelopedSurface* New(); - vtkTypeMacro(vtkDevelopedSurface, vtkDataSetAlgorithm); + vtkTypeMacro(vtkDevelopedSurface, vtkDataSetAlgorithm) void PrintSelf(ostream& os, vtkIndent indent) override; void SetCutFunction(vtkImplicitFunction* func); diff --git a/src/Plugins/DifferenceTimesteps/plugin/DifferenceTimestepsModule/vtkDifferenceTimestepsFilter.cxx b/src/Plugins/DifferenceTimesteps/plugin/DifferenceTimestepsModule/vtkDifferenceTimestepsFilter.cxx index 99866cbf..4523f6a2 100644 --- a/src/Plugins/DifferenceTimesteps/plugin/DifferenceTimestepsModule/vtkDifferenceTimestepsFilter.cxx +++ b/src/Plugins/DifferenceTimesteps/plugin/DifferenceTimestepsModule/vtkDifferenceTimestepsFilter.cxx @@ -53,7 +53,7 @@ vtkDataArray* DataTempDiffArray( // Templated difference function template -void vtkTemporalDataDifference(vtkDifferenceTimestepsFilter* theDTF, vtkDataArray* theOutput, +void vtkTemporalDataDifference(vtkDifferenceTimestepsFilter* /*theDTF*/, vtkDataArray* theOutput, vtkDataArray** theArrays, vtkIdType theNumComp, T*) { T* anOutputData = static_cast(theOutput->GetVoidPointer(0)); @@ -79,7 +79,7 @@ void vtkTemporalDataDifference(vtkDifferenceTimestepsFilter* theDTF, vtkDataArra theOutput->SetNumberOfTuples(N); } -vtkStandardNewMacro(vtkDifferenceTimestepsFilter); +vtkStandardNewMacro(vtkDifferenceTimestepsFilter) //-------------------------------------------------------------------------------------------------- vtkDifferenceTimestepsFilter::vtkDifferenceTimestepsFilter() @@ -171,11 +171,11 @@ int vtkDifferenceTimestepsFilter::RequestDataObject(vtkInformation* vtkNotUsed(t //-------------------------------------------------------------------------------------------------- int vtkDifferenceTimestepsFilter::RequestInformation(vtkInformation* vtkNotUsed(theRequest), - vtkInformationVector** theInputVector, vtkInformationVector* theOutputVector) + vtkInformationVector** theInputVector, vtkInformationVector* /*theOutputVector*/) { // Get input and output information objects vtkInformation* anInInfo = theInputVector[0]->GetInformationObject(0); - vtkInformation* anOutInfo = theOutputVector->GetInformationObject(0); + //vtkInformation* anOutInfo = theOutputVector->GetInformationObject(0); // todo: unused // Check for presence more than one time step if (anInInfo->Has(vtkStreamingDemandDrivenPipeline::TIME_STEPS())) @@ -227,7 +227,7 @@ int vtkDifferenceTimestepsFilter::RequestInformation(vtkInformation* vtkNotUsed( } //-------------------------------------------------------------------------------------------------- -int vtkDifferenceTimestepsFilter::RequestUpdateExtent(vtkInformation* theRequest, +int vtkDifferenceTimestepsFilter::RequestUpdateExtent(vtkInformation* /*theRequest*/, vtkInformationVector** theInputVector, vtkInformationVector* theOutputVector) { // Get the information objects diff --git a/src/Plugins/DifferenceTimesteps/plugin/DifferenceTimestepsModule/vtkDifferenceTimestepsFilter.h b/src/Plugins/DifferenceTimesteps/plugin/DifferenceTimestepsModule/vtkDifferenceTimestepsFilter.h index 52c2de17..53de6e98 100644 --- a/src/Plugins/DifferenceTimesteps/plugin/DifferenceTimestepsModule/vtkDifferenceTimestepsFilter.h +++ b/src/Plugins/DifferenceTimesteps/plugin/DifferenceTimestepsModule/vtkDifferenceTimestepsFilter.h @@ -38,7 +38,7 @@ public: /// Returns pointer on a new instance of the class static vtkDifferenceTimestepsFilter* New(); - vtkTypeMacro(vtkDifferenceTimestepsFilter, vtkMultiTimeStepAlgorithm); + vtkTypeMacro(vtkDifferenceTimestepsFilter, vtkMultiTimeStepAlgorithm) /// Prints current state of the objects void PrintSelf(ostream&, vtkIndent) override; diff --git a/src/Plugins/ElevationSurface/plugin/ElevationSurfaceModule/vtkElevationSurfaceFilter.cxx b/src/Plugins/ElevationSurface/plugin/ElevationSurfaceModule/vtkElevationSurfaceFilter.cxx index 7e340cb3..056c63bb 100644 --- a/src/Plugins/ElevationSurface/plugin/ElevationSurfaceModule/vtkElevationSurfaceFilter.cxx +++ b/src/Plugins/ElevationSurface/plugin/ElevationSurfaceModule/vtkElevationSurfaceFilter.cxx @@ -38,7 +38,7 @@ #include //vtkCxxRevisionMacro(vtkElevationSurfaceFilter, "$Revision$"); -vtkStandardNewMacro(vtkElevationSurfaceFilter); +vtkStandardNewMacro(vtkElevationSurfaceFilter) vtkElevationSurfaceFilter::vtkElevationSurfaceFilter() { @@ -117,13 +117,13 @@ int vtkElevationSurfaceFilter::RequestUpdateExtent( return 1; } -int vtkElevationSurfaceFilter::RequestInformation(vtkInformation *request, - vtkInformationVector **input, vtkInformationVector *output) +int vtkElevationSurfaceFilter::RequestInformation(vtkInformation * /*request*/, + vtkInformationVector ** /*input*/, vtkInformationVector * /*output*/) { return 1; } -int vtkElevationSurfaceFilter::RequestData(vtkInformation *request, +int vtkElevationSurfaceFilter::RequestData(vtkInformation * /*request*/, vtkInformationVector **input, vtkInformationVector *output) { vtkPolyData *pdIn = vtkPolyData::SafeDownCast( diff --git a/src/Plugins/ElevationSurface/plugin/ElevationSurfaceModule/vtkElevationSurfaceFilter.h b/src/Plugins/ElevationSurface/plugin/ElevationSurfaceModule/vtkElevationSurfaceFilter.h index 3ca1f2e1..2366ad9d 100644 --- a/src/Plugins/ElevationSurface/plugin/ElevationSurfaceModule/vtkElevationSurfaceFilter.h +++ b/src/Plugins/ElevationSurface/plugin/ElevationSurfaceModule/vtkElevationSurfaceFilter.h @@ -28,7 +28,7 @@ class VTK_EXPORT vtkElevationSurfaceFilter : public vtkAlgorithm { public: static vtkElevationSurfaceFilter* New(); - vtkTypeMacro(vtkElevationSurfaceFilter, vtkAlgorithm); + vtkTypeMacro(vtkElevationSurfaceFilter, vtkAlgorithm) void PrintSelf(ostream& os, vtkIndent indent) override; // Description : diff --git a/src/Plugins/EllipseBuilder/plugin/EllipseBuilderModule/vtkEllipseBuilderFilter.cxx b/src/Plugins/EllipseBuilder/plugin/EllipseBuilderModule/vtkEllipseBuilderFilter.cxx index 610cca94..3f28a0cd 100644 --- a/src/Plugins/EllipseBuilder/plugin/EllipseBuilderModule/vtkEllipseBuilderFilter.cxx +++ b/src/Plugins/EllipseBuilder/plugin/EllipseBuilderModule/vtkEllipseBuilderFilter.cxx @@ -107,7 +107,7 @@ list GetListOfFields(vtkDataObject* theObject) } //------------------------------------------------------------------------------ -vtkStandardNewMacro(vtkEllipseBuilderFilter); +vtkStandardNewMacro(vtkEllipseBuilderFilter) //------------------------------------------------------------------------------ vtkEllipseBuilderFilter::vtkEllipseBuilderFilter() : vtkMultiBlockDataSetAlgorithm() diff --git a/src/Plugins/EllipseBuilder/plugin/EllipseBuilderModule/vtkEllipseBuilderFilter.h b/src/Plugins/EllipseBuilder/plugin/EllipseBuilderModule/vtkEllipseBuilderFilter.h index b28655f5..5358c507 100644 --- a/src/Plugins/EllipseBuilder/plugin/EllipseBuilderModule/vtkEllipseBuilderFilter.h +++ b/src/Plugins/EllipseBuilder/plugin/EllipseBuilderModule/vtkEllipseBuilderFilter.h @@ -34,7 +34,7 @@ public: /// Returns pointer on a new instance of the class static vtkEllipseBuilderFilter* New(); - vtkTypeMacro(vtkEllipseBuilderFilter, vtkMultiBlockDataSetAlgorithm); + vtkTypeMacro(vtkEllipseBuilderFilter, vtkMultiBlockDataSetAlgorithm) /// Prints current state of the objects void PrintSelf(ostream& os, vtkIndent indent) override; diff --git a/src/Plugins/GaussToCell/plugin/GaussToCellModule/vtkGaussToCell.cxx b/src/Plugins/GaussToCell/plugin/GaussToCellModule/vtkGaussToCell.cxx index 7961b8ca..dd4e891b 100644 --- a/src/Plugins/GaussToCell/plugin/GaussToCellModule/vtkGaussToCell.cxx +++ b/src/Plugins/GaussToCell/plugin/GaussToCellModule/vtkGaussToCell.cxx @@ -86,7 +86,7 @@ using MEDCoupling::MEDCouplingFieldDouble; using MEDCoupling::ON_GAUSS_PT; using MEDCoupling::MCAuto; -vtkStandardNewMacro(vtkGaussToCell); +vtkStandardNewMacro(vtkGaussToCell) vtkInformationDoubleVectorKey *GetMEDReaderMetaDataIfAny() { @@ -180,7 +180,7 @@ void vtkGaussToCell::SetMinFlag(bool minStatus) } } -int vtkGaussToCell::RequestInformation(vtkInformation *request, vtkInformationVector **inputVector, vtkInformationVector *outputVector) +int vtkGaussToCell::RequestInformation(vtkInformation * /*request*/, vtkInformationVector **inputVector, vtkInformationVector * /*outputVector*/) { //std::cerr << "########################################## vtkGaussToCell::RequestInformation ##########################################" << std::endl; try @@ -262,7 +262,7 @@ void DealWith(const char *postName, vtkDoubleArray *zearray, vtkIdTypeArray *off dc(inData,offData,nbgPerCell,zeNbCompo,outNbCells,outData); } -int vtkGaussToCell::RequestData(vtkInformation *request, vtkInformationVector **inputVector, vtkInformationVector *outputVector) +int vtkGaussToCell::RequestData(vtkInformation * /*request*/, vtkInformationVector **inputVector, vtkInformationVector *outputVector) { //std::cerr << "########################################## vtkGaussToCell::RequestData ##########################################" << std::endl; try diff --git a/src/Plugins/GaussToCell/plugin/GaussToCellModule/vtkGaussToCell.h b/src/Plugins/GaussToCell/plugin/GaussToCellModule/vtkGaussToCell.h index 1d6cc23e..1d941a7b 100644 --- a/src/Plugins/GaussToCell/plugin/GaussToCellModule/vtkGaussToCell.h +++ b/src/Plugins/GaussToCell/plugin/GaussToCellModule/vtkGaussToCell.h @@ -29,7 +29,7 @@ class VTK_EXPORT vtkGaussToCell : public vtkUnstructuredGridAlgorithm { public: static vtkGaussToCell* New(); - vtkTypeMacro(vtkGaussToCell, vtkUnstructuredGridAlgorithm); + vtkTypeMacro(vtkGaussToCell, vtkUnstructuredGridAlgorithm) void PrintSelf(ostream& os, vtkIndent indent) override; void SetAvgFlag(bool avgStatus); diff --git a/src/Plugins/JSONReader/plugin/JSONParserModule/vtkJSONParser.cxx b/src/Plugins/JSONReader/plugin/JSONParserModule/vtkJSONParser.cxx index 2ed434e1..937599bc 100644 --- a/src/Plugins/JSONReader/plugin/JSONParserModule/vtkJSONParser.cxx +++ b/src/Plugins/JSONReader/plugin/JSONParserModule/vtkJSONParser.cxx @@ -93,12 +93,12 @@ vtkJSONException::vtkJSONException(const char* reason) } //--------------------------------------------------- -vtkJSONException::~vtkJSONException() throw() +vtkJSONException::~vtkJSONException() noexcept { } //--------------------------------------------------- -const char* vtkJSONException::what() const throw() +const char* vtkJSONException::what() const noexcept { return Reason.c_str(); } diff --git a/src/Plugins/JSONReader/plugin/JSONParserModule/vtkJSONParser.h b/src/Plugins/JSONReader/plugin/JSONParserModule/vtkJSONParser.h index 6f05d843..4006c3aa 100644 --- a/src/Plugins/JSONReader/plugin/JSONParserModule/vtkJSONParser.h +++ b/src/Plugins/JSONReader/plugin/JSONParserModule/vtkJSONParser.h @@ -37,8 +37,8 @@ class VTK_EXPORT vtkJSONException : public std::exception { public: vtkJSONException(const char* reason); - ~vtkJSONException() throw(); - const char* what() const throw(); + ~vtkJSONException() noexcept; + const char* what() const noexcept; protected: std::string Reason; diff --git a/src/Plugins/JSONReader/plugin/JSONReaderModule/vtkJSONReader.cxx b/src/Plugins/JSONReader/plugin/JSONReaderModule/vtkJSONReader.cxx index bcc3b862..ff72f761 100644 --- a/src/Plugins/JSONReader/plugin/JSONReaderModule/vtkJSONReader.cxx +++ b/src/Plugins/JSONReader/plugin/JSONReaderModule/vtkJSONReader.cxx @@ -54,11 +54,11 @@ vtkJSONException::vtkJSONException(const char *reason) : Reason(reason) { } //--------------------------------------------------- -vtkJSONException::~vtkJSONException() throw () { +vtkJSONException::~vtkJSONException() noexcept { } //--------------------------------------------------- -const char* vtkJSONException::what() const throw() { +const char* vtkJSONException::what() const noexcept { return Reason.c_str(); } @@ -69,7 +69,7 @@ public: typedef std::vector > > DataType; Container(){} void initKeys(std::vector &keys, std::string &err) { - for(int i = 0; i < keys.size(); i++) { + for(int i = 0; i < (int)keys.size(); i++) { if( !checkVar(keys[i].c_str()) ) { std::ostringstream oss; oss<<"Bad key value '"<Parse(root, output_table); return 1; } - catch(vtkJSONException e) { + catch(vtkJSONException& e) { std::ostringstream oss; oss<HasObserver("ErrorEvent") ) @@ -251,10 +251,10 @@ void vtkJSONReader::Parse(Json::Value& root, vtkTable *table) { jSONListOfNames = jSONMetaData.get(SHT, Json::Value::null); std::ostringstream oss; oss<< "Short Names : [ "; - for (int i = 0; i < jSONListOfNames.size(); i++) { + for (int i = 0; i < (int)jSONListOfNames.size(); i++) { oss << "'" << jSONListOfNames[i].asString() << "'"; short_names.push_back(jSONListOfNames[i].asString()); - if ( i != jSONListOfNames.size() - 1 ) { + if ( i != (int)jSONListOfNames.size() - 1 ) { oss << ", "; } } @@ -267,9 +267,9 @@ void vtkJSONReader::Parse(Json::Value& root, vtkTable *table) { jSONListOfLongName = jSONMetaData.get(LNG, Json::Value::null); std::ostringstream oss; oss << "Long Names : [ "; - for (int i = 0; i < jSONListOfLongName.size(); ++i) { + for (int i = 0; i < (int)jSONListOfLongName.size(); ++i) { oss << "'" << jSONListOfLongName[i].asString() << "'"; - if ( i != jSONListOfLongName.size()-1 ) { + if ( i != (int)jSONListOfLongName.size()-1 ) { oss << ", "; } } @@ -281,9 +281,9 @@ void vtkJSONReader::Parse(Json::Value& root, vtkTable *table) { hasUnits = true; std::ostringstream oss; oss << "Units : [ "; - for (int i = 0; i < jSONListOfUnits.size(); ++i) { + for (int i = 0; i < (int)jSONListOfUnits.size(); ++i) { oss << "'" << jSONListOfUnits[i].asString() << "'"; - if ( i != jSONListOfUnits.size()-1 ) { + if ( i != (int)jSONListOfUnits.size()-1 ) { oss << ", "; } } @@ -333,7 +333,7 @@ void vtkJSONReader::Parse(Json::Value& root, vtkTable *table) { } initContainer = true; } - for(int i=0; i < members.size(); i++) { + for(int i=0; i < (int)members.size(); i++) { Json::Value val = (*it).get(members[i],Json::Value::null); double value = 0.0; switch (val.type()) { @@ -374,7 +374,7 @@ void vtkJSONReader::Parse(Json::Value& root, vtkTable *table) { if(data.size() > 0) nbRows = data[0].second.size(); - for(int i = 0; i < data.size(); i++) { + for(int i = 0; i < (int)data.size(); i++) { vtkDoubleArray* newCol = vtkDoubleArray::New(); newCol->SetNumberOfValues(nbRows); std::string name = data[i].first; @@ -386,7 +386,7 @@ void vtkJSONReader::Parse(Json::Value& root, vtkTable *table) { } name += "]"; newCol->SetName(name.c_str()); - for(int j = 0; j < data[i].second.size(); j++) { + for(int j = 0; j < (int)data[i].second.size(); j++) { newCol->SetValue(j, data[i].second[j]); } table->AddColumn(newCol); diff --git a/src/Plugins/JSONReader/plugin/JSONReaderModule/vtkJSONReader.h b/src/Plugins/JSONReader/plugin/JSONReaderModule/vtkJSONReader.h index 817b04cf..8afd2f1f 100644 --- a/src/Plugins/JSONReader/plugin/JSONReaderModule/vtkJSONReader.h +++ b/src/Plugins/JSONReader/plugin/JSONReaderModule/vtkJSONReader.h @@ -29,8 +29,8 @@ class VTK_EXPORT vtkJSONException : public std::exception { public: vtkJSONException(const char* reason); - ~vtkJSONException() throw(); - const char* what() const throw(); + ~vtkJSONException() noexcept; + const char* what() const noexcept; protected: std::string Reason; @@ -42,7 +42,7 @@ class VTK_EXPORT vtkJSONReader : public vtkTableAlgorithm { public: static vtkJSONReader* New(); - vtkTypeMacro(vtkJSONReader, vtkTableAlgorithm); + vtkTypeMacro(vtkJSONReader, vtkTableAlgorithm) void PrintSelf(ostream& os, vtkIndent indent) override; // Specifies the name of the file diff --git a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/ExtractGroupHelper.cxx b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/ExtractGroupHelper.cxx index 562a5c11..1e556210 100644 --- a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/ExtractGroupHelper.cxx +++ b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/ExtractGroupHelper.cxx @@ -147,7 +147,6 @@ void ExtractGroupInternal::loadFrom(vtkMutableDirectedGraph *sil) throw INTERP_KERNEL::Exception("There is an internal error ! The tree on server side has not the expected look !"); vtkAdjacentVertexIterator *it0(vtkAdjacentVertexIterator::New()); sil->GetAdjacentVertices(id0,it0); - int kk(0),ll(0); while(it0->HasNext()) { vtkIdType id1(it0->Next()); diff --git a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx index a8396b31..61edea6c 100644 --- a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx +++ b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx @@ -444,7 +444,7 @@ bool MEDFileFieldRepresentationLeavesArrays::setStatus(bool status) const void MEDFileFieldRepresentationLeavesArrays::appendFields(const MEDTimeReq *tr, const MEDCoupling::MEDFileFieldGlobsReal *globs, const MEDCoupling::MEDMeshMultiLev *mml, const MEDCoupling::MEDFileMeshStruct *mst, vtkDataSet *ds, ExportedTinyInfo *internalInfo) const { - const int VTK_DATA_ARRAY_DELETE=vtkDataArrayTemplate::VTK_DATA_ARRAY_DELETE; + //const int VTK_DATA_ARRAY_DELETE=vtkDataArrayTemplate::VTK_DATA_ARRAY_DELETE; // todo: unused tr->setNumberOfTS((operator->())->getNumberOfTS()); tr->initIterator(); for(int timeStepId=0;timeStepIdsize();timeStepId++,++(*tr)) @@ -580,6 +580,11 @@ void MEDFileFieldRepresentationLeaves::computeFullNameInLeaves(const std::string /*! * \param [in] ms is the meshes pointer. It can be used only for information of geometric types. No special processing will be requested on ms. + * \param [in] meshName + * \param [in] sil + * \param [in] root + * \param [in] edge + * \param [out] names */ void MEDFileFieldRepresentationLeaves::feedSIL(const MEDCoupling::MEDFileMeshes *ms, const std::string& meshName, vtkMutableDirectedGraph* sil, vtkIdType root, vtkVariantArray *edge, std::vector& names) const { @@ -1194,7 +1199,6 @@ void MEDFileFieldRepresentationTree::loadInMemory(MEDCoupling::MEDFileFields *fi fields_per_mesh[i]=_fields->partOfThisLyingOnSpecifiedMeshName(meshNames[i].c_str()); } std::vector< MCAuto > allFMTSLeavesToDisplaySafe; - std::size_t k(0); for(std::vector< MCAuto >::const_iterator fields=fields_per_mesh.begin();fields!=fields_per_mesh.end();fields++) { for(int j=0;j<(*fields)->getNumberOfFields();j++) @@ -1401,9 +1405,9 @@ vtkDataSet *MEDFileFieldRepresentationTree::buildVTKInstance(bool isStdOrMode, d if(ts.size()!=1) { std::vector ts2(ts.size()); - std::transform(ts.begin(),ts.end(),ts2.begin(),std::bind2nd(std::plus(),-timeReq)); - std::transform(ts2.begin(),ts2.end(),ts2.begin(),std::ptr_fun(fabs)); - zeTimeId=std::distance(ts2.begin(),std::find_if(ts2.begin(),ts2.end(),std::bind2nd(std::less(),1e-14))); + std::transform(ts.begin(),ts.end(),ts2.begin(),std::bind(std::plus(),std::placeholders::_1,-timeReq)); + std::transform(ts2.begin(),ts2.end(),ts2.begin(),[](double c) {return fabs(c);}); + zeTimeId=std::distance(ts2.begin(),std::find_if(ts2.begin(),ts2.end(),std::bind(std::less(),std::placeholders::_1,1e-14))); } //2nd chance if(zeTimeId==ts.size()) diff --git a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDTimeReq.cxx b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDTimeReq.cxx index 3d03b13a..abdbda97 100644 --- a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDTimeReq.cxx +++ b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDTimeReq.cxx @@ -39,7 +39,7 @@ MEDStdTimeReq::MEDStdTimeReq(int timeReq):_time_req(timeReq) /*! * Does nothing ! It is not a bug */ -void MEDStdTimeReq::setNumberOfTS(int nbOfTS) const +void MEDStdTimeReq::setNumberOfTS(int /*nbOfTS*/) const { } diff --git a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDUtilities.cxx b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDUtilities.cxx index bcd0c044..efbbe9a7 100644 --- a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDUtilities.cxx +++ b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDUtilities.cxx @@ -25,8 +25,8 @@ #include -vtkInformationKeyMacro(MEDUtilities,ELGA,Integer); -vtkInformationKeyMacro(MEDUtilities,ELNO,Integer); +vtkInformationKeyMacro(MEDUtilities,ELGA,Integer) +vtkInformationKeyMacro(MEDUtilities,ELNO,Integer) void ExportedTinyInfo::pushGaussAdditionnalInfo(int ct, int dim, const std::vector& refCoo, const std::vector& posInRefCoo) { diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOFilter.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOFilter.cxx index c1de8c06..29e6251c 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOFilter.cxx +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOFilter.cxx @@ -36,7 +36,7 @@ #include "InterpKernelAutoPtr.hxx" //vtkCxxRevisionMacro(vtkELNOFilter, "$Revision: 1.2.2.2 $"); -vtkStandardNewMacro(vtkELNOFilter); +vtkStandardNewMacro(vtkELNOFilter) vtkELNOFilter::vtkELNOFilter() { @@ -52,7 +52,7 @@ int vtkELNOFilter::RequestData(vtkInformation *request, vtkInformationVector **i vtkUnstructuredGrid *usgIn(vtkUnstructuredGrid::SafeDownCast( input[0]->GetInformationObject(0)->Get(vtkDataObject::DATA_OBJECT()))); vtkPolyData *pdOut(vtkPolyData::SafeDownCast(output->GetInformationObject(0)->Get(vtkDataObject::DATA_OBJECT()))); - vtkDataArray *array(this->GetInputArrayToProcess(0, input)); + //vtkDataArray *array(this->GetInputArrayToProcess(0, input)); // todo: unused vtkIdTypeArray* offsets(vtkIdTypeArray::SafeDownCast(this->GetInputArrayToProcess(0, input))); if(usgIn == NULL || offsets == NULL || pdOut == NULL) @@ -82,7 +82,7 @@ int vtkELNOFilter::RequestData(vtkInformation *request, vtkInformationVector **i vtkIdType start(0); for(vtkIdType cellId = 0; cellId < ncell; cellId++) { - vtkIdType offset(offsets->GetValue(cellId)); + //vtkIdType offset(offsets->GetValue(cellId)); // todo: unused int cellType(usgIn->GetCellType(cellId)); // a simple check to see if a scheme really exists for this cell type. // should not happen if the cell type has not been modified. @@ -152,7 +152,7 @@ int vtkELNOFilter::RequestData(vtkInformation *request, vtkInformationVector **i for(vtkIdType cellId=0;cellIdGetCell(cellId)); - vtkIdType nbPoints(cell->GetNumberOfPoints()),offset(offsetPtr[cellId]); + vtkIdType nbPoints(cell->GetNumberOfPoints())/*,offset(offsetPtr[cellId])*/; // todo: offset is unused for(vtkIdType j=0;jSetTuple(zeId,offsetPtr[cellId]+j,data); } diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOFilter.h b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOFilter.h index 9ff053a6..74b46f3a 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOFilter.h +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOFilter.h @@ -26,7 +26,7 @@ class VTK_EXPORT vtkELNOFilter: public vtkQuadraturePointsGenerator { public: static vtkELNOFilter *New(); - vtkTypeMacro(vtkELNOFilter,vtkQuadraturePointsGenerator); + vtkTypeMacro(vtkELNOFilter,vtkQuadraturePointsGenerator) void PrintSelf(ostream& os, vtkIndent indent); // Description : diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOMeshFilter.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOMeshFilter.cxx index 64258061..32d05ff9 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOMeshFilter.cxx +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOMeshFilter.cxx @@ -39,7 +39,7 @@ #include -vtkStandardNewMacro(vtkELNOMeshFilter); +vtkStandardNewMacro(vtkELNOMeshFilter) vtkELNOMeshFilter::vtkELNOMeshFilter():ShrinkFactor(0.9999) { @@ -49,7 +49,7 @@ vtkELNOMeshFilter::~vtkELNOMeshFilter() { } -int vtkELNOMeshFilter::RequestData(vtkInformation *request, +int vtkELNOMeshFilter::RequestData(vtkInformation * /*request*/, vtkInformationVector **input, vtkInformationVector *output) { vtkUnstructuredGrid *usgIn = vtkUnstructuredGrid::SafeDownCast( @@ -80,7 +80,7 @@ int vtkELNOMeshFilter::RequestData(vtkInformation *request, // now copy ELNO data. Start by verifying if it is possible to // shallow copy the array. - vtkInformation *info(usgIn->GetInformation()); + //vtkInformation *info(usgIn->GetInformation()); // todo: unused // vtkIdType nVerts(shrinked->GetNumberOfPoints()),ncell(usgIn->GetNumberOfCells()); // first loop through all cells to check if a shallow copy is possible @@ -190,7 +190,7 @@ int vtkELNOMeshFilter::RequestData(vtkInformation *request, for(vtkIdType cellId=0;cellIdGetCell(cellId)); - vtkIdType nbPoints(cell->GetNumberOfPoints()),offset(offsetPtr[cellId]); + vtkIdType nbPoints(cell->GetNumberOfPoints())/*,offset(offsetPtr[cellId])*/; // todo: offset is unused for(vtkIdType j=0;jSetTuple(zeId,offsetPtr[cellId]+j,data); } diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOMeshFilter.h b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOMeshFilter.h index 20881ebb..d8aa97c4 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOMeshFilter.h +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOMeshFilter.h @@ -26,7 +26,7 @@ class VTK_EXPORT vtkELNOMeshFilter: public vtkUnstructuredGridAlgorithm { public: static vtkELNOMeshFilter *New(); - vtkTypeMacro(vtkELNOMeshFilter,vtkUnstructuredGridAlgorithm); + vtkTypeMacro(vtkELNOMeshFilter,vtkUnstructuredGridAlgorithm) void PrintSelf(ostream& os, vtkIndent indent); vtkGetMacro(ShrinkFactor, double); diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOSurfaceFilter.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOSurfaceFilter.cxx index d29f1aa2..a1c2b9e5 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOSurfaceFilter.cxx +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOSurfaceFilter.cxx @@ -37,7 +37,6 @@ //vtkCxxRevisionMacro(vtkELNOSurfaceFilter, "$Revision$") //; vtkStandardNewMacro(vtkELNOSurfaceFilter) -; vtkELNOSurfaceFilter::vtkELNOSurfaceFilter() { @@ -47,7 +46,7 @@ vtkELNOSurfaceFilter::~vtkELNOSurfaceFilter() { } -int vtkELNOSurfaceFilter::RequestData(vtkInformation *request, vtkInformationVector **input, vtkInformationVector *output) +int vtkELNOSurfaceFilter::RequestData(vtkInformation * /*request*/, vtkInformationVector **input, vtkInformationVector *output) { vtkUnstructuredGrid *usgIn=vtkUnstructuredGrid::SafeDownCast( input[0]->GetInformationObject(0)->Get(vtkDataObject::DATA_OBJECT())); diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOSurfaceFilter.h b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOSurfaceFilter.h index 96ad9127..31934307 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOSurfaceFilter.h +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkELNOSurfaceFilter.h @@ -26,7 +26,7 @@ class VTK_EXPORT vtkELNOSurfaceFilter: public vtkUnstructuredGridAlgorithm { public: static vtkELNOSurfaceFilter *New(); - vtkTypeMacro(vtkELNOSurfaceFilter,vtkUnstructuredGridAlgorithm); + vtkTypeMacro(vtkELNOSurfaceFilter,vtkUnstructuredGridAlgorithm) void PrintSelf(ostream& os, vtkIndent indent); protected: diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.cxx index a56b4041..bb3fc7c9 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.cxx +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.cxx @@ -58,12 +58,13 @@ #include #include -vtkStandardNewMacro(vtkExtractCellType); +vtkStandardNewMacro(vtkExtractCellType) -vtkCxxSetObjectMacro(vtkExtractCellType, SIL, vtkMutableDirectedGraph); +vtkCxxSetObjectMacro(vtkExtractCellType, SIL, vtkMutableDirectedGraph) /////////////////// +/// \cond PRIVATE class ExtractCellTypeStatus { public: @@ -216,7 +217,7 @@ bool vtkExtractCellType::vtkExtractCellTypeInternal::getStatusOfEntryStr(const c const ExtractCellTypeStatus& elt(getEntry(entry)); return elt.getStatus(); } - catch (INTERP_KERNEL::Exception e) + catch (INTERP_KERNEL::Exception& /*e*/) { //std::cerr << vtkDebugMacro"Exception has been thrown in vtkExtractCellType::vtkExtractCellTypeInternal::getStatusOfEntryStr : " << e.what() << std::endl; return false; @@ -230,7 +231,7 @@ void vtkExtractCellType::vtkExtractCellTypeInternal::setStatusOfEntryStr(const c const ExtractCellTypeStatus& elt(getEntry(entry)); elt.setStatus(status); } - catch (INTERP_KERNEL::Exception e) + catch (INTERP_KERNEL::Exception& /*e*/) { //std::cerr << "Exception has been thrown in vtkExtractCellType::vtkExtractCellTypeInternal::setStatusOfEntryStr : " << e.what() << std::endl; } @@ -267,10 +268,11 @@ void ExtractCellTypeStatus::feedSIL(vtkMutableDirectedGraph *sil, vtkIdType root { vtkIdType InfoGeoType(sil->AddChild(root,childEdge)); names.push_back(_type_str); - vtkIdType InfoVTKID(sil->AddChild(InfoGeoType,childEdge)); + /*vtkIdType InfoVTKID(*/sil->AddChild(InfoGeoType,childEdge)/*)*/; // todo: unused std::ostringstream oss; oss << _vtkt; names.push_back(oss.str()); } +/// \endcond PRIVATE //////////////////// @@ -294,7 +296,7 @@ void vtkExtractCellType::SetInsideOut(int val) } } -int vtkExtractCellType::RequestInformation(vtkInformation *request, vtkInformationVector **inputVector, vtkInformationVector *outputVector) +int vtkExtractCellType::RequestInformation(vtkInformation * /*request*/, vtkInformationVector **inputVector, vtkInformationVector *outputVector) { try { @@ -375,8 +377,8 @@ vtkDataSet *FilterFamilies(vtkDataSet *input, const std::vector& idsToKeep, output->ShallowCopy(input); vtkSmartPointer thres(vtkSmartPointer::New()); thres->SetInputData(output); - vtkDataSetAttributes *dscIn(input->GetCellData()),*dscIn2(input->GetPointData()); - vtkDataSetAttributes *dscOut(output->GetCellData()),*dscOut2(output->GetPointData()); + //vtkDataSetAttributes *dscIn(input->GetCellData()),*dscIn2(input->GetPointData()); // todo: unused + //vtkDataSetAttributes *dscOut(output->GetCellData()),*dscOut2(output->GetPointData()); // todo: unused // double vMin(insideOut==0?1.:0.),vMax(insideOut==0?2.:1.); thres->ThresholdBetween(vMin,vMax); @@ -414,14 +416,14 @@ vtkDataSet *FilterFamilies(vtkDataSet *input, const std::vector& idsToKeep, return zeComputedOutput; } -int vtkExtractCellType::RequestData(vtkInformation *request, vtkInformationVector **inputVector, vtkInformationVector *outputVector) +int vtkExtractCellType::RequestData(vtkInformation * /*request*/, vtkInformationVector **inputVector, vtkInformationVector *outputVector) { try { //std::cerr << "########################################## vtkExtractCellType::RequestData ##########################################" << std::endl; vtkInformation* inputInfo=inputVector[0]->GetInformationObject(0); vtkDataSet *input(vtkDataSet::SafeDownCast(inputInfo->Get(vtkDataObject::DATA_OBJECT()))); - vtkInformation *info(input->GetInformation()); + //vtkInformation *info(input->GetInformation()); // todo: unused vtkInformation *outInfo(outputVector->GetInformationObject(0)); vtkDataSet *output(vtkDataSet::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT()))); std::vector idsToKeep(this->Internal->getIdsToKeep()); diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.h b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.h index 624b9e62..bf763b0d 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.h +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.h @@ -44,10 +44,10 @@ protected: vtkExtractCellType(); ~vtkExtractCellType(); - int RequestInformation(vtkInformation *request, + int RequestInformation(vtkInformation * request, vtkInformationVector **inputVector, vtkInformationVector *outputVector); - int RequestData(vtkInformation *request, vtkInformationVector **inputVector, + int RequestData(vtkInformation * request, vtkInformationVector **inputVector, vtkInformationVector *outputVector); // Description: // This SIL stores the structure of the mesh/groups/cell types diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx index 0406578b..5996b950 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx @@ -67,7 +67,7 @@ #include #include -vtkStandardNewMacro(vtkExtractGroup); +vtkStandardNewMacro(vtkExtractGroup) class vtkExtractGroup::vtkExtractGroupInternal : public ExtractGroupInternal { @@ -93,14 +93,14 @@ void vtkExtractGroup::SetInsideOut(int val) } } -int vtkExtractGroup::RequestInformation(vtkInformation *request, vtkInformationVector **inputVector, vtkInformationVector *outputVector) +int vtkExtractGroup::RequestInformation(vtkInformation * /*request*/, vtkInformationVector **inputVector, vtkInformationVector */*outputVector*/) { // vtkUnstructuredGridAlgorithm::RequestInformation(request,inputVector,outputVector); try { // std::cerr << "########################################## vtkExtractGroup::RequestInformation ##########################################" << std::endl; // request->Print(cout); - vtkInformation *outInfo(outputVector->GetInformationObject(0)); + //vtkInformation *outInfo(outputVector->GetInformationObject(0)); // todo: unused vtkInformation *inputInfo(inputVector[0]->GetInformationObject(0)); if(!ExtractGroupInternal::IndependantIsInformationOK(vtkMEDReader::META_DATA(),inputInfo)) { @@ -140,8 +140,8 @@ vtkDataSet *FilterFamilies(vtkSmartPointer& thres, vtkDataSet *output(input->NewInstance()); output->ShallowCopy(input); thres->SetInputData(output); - vtkDataSetAttributes *dscIn(input->GetCellData()),*dscIn2(input->GetPointData()); - vtkDataSetAttributes *dscOut(output->GetCellData()),*dscOut2(output->GetPointData()); + //vtkDataSetAttributes *dscIn(input->GetCellData()),*dscIn2(input->GetPointData()); // todo: unused + //vtkDataSetAttributes *dscOut(output->GetCellData()),*dscOut2(output->GetPointData()); // todo: unused // double vMin(insideOut==0?1.:0.),vMax(insideOut==0?2.:1.); thres->ThresholdBetween(vMin,vMax); @@ -214,7 +214,7 @@ public: private: vtkDataSet *_ds; }; -int vtkExtractGroup::RequestData(vtkInformation *request, vtkInformationVector **inputVector, vtkInformationVector *outputVector) +int vtkExtractGroup::RequestData(vtkInformation * /*request*/, vtkInformationVector **inputVector, vtkInformationVector *outputVector) { try { @@ -233,7 +233,7 @@ int vtkExtractGroup::RequestData(vtkInformation *request, vtkInformationVector * return 0; } vtkDataSet *input(vtkDataSet::SafeDownCast(inputMB->GetBlock(0))); - vtkInformation *info(input->GetInformation()); + //vtkInformation *info(input->GetInformation()); // todo: unused vtkInformation *outInfo(outputVector->GetInformationObject(0)); vtkMultiBlockDataSet *output(vtkMultiBlockDataSet::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT()))); std::set idsToKeep(this->Internal->getIdsToKeep()); diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.h b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.h index ebfee7f7..21410a22 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.h +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.h @@ -46,10 +46,10 @@ protected: vtkExtractGroup(); ~vtkExtractGroup(); - int RequestInformation(vtkInformation *request, + int RequestInformation(vtkInformation * request, vtkInformationVector **inputVector, vtkInformationVector *outputVector); - int RequestData(vtkInformation *request, vtkInformationVector **inputVector, + int RequestData(vtkInformation * request, vtkInformationVector **inputVector, vtkInformationVector *outputVector); // Description: diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupAsMultiBlock.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupAsMultiBlock.cxx index e64e8ed1..6bb185f5 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupAsMultiBlock.cxx +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupAsMultiBlock.cxx @@ -48,7 +48,7 @@ class vtkGroupAsMultiBlockInternal : public ExtractGroupInternal { }; -vtkStandardNewMacro(vtkGroupAsMultiBlock); +vtkStandardNewMacro(vtkGroupAsMultiBlock) vtkGroupAsMultiBlock::vtkGroupAsMultiBlock():Internal(new ExtractGroupInternal) { @@ -59,9 +59,9 @@ vtkGroupAsMultiBlock::~vtkGroupAsMultiBlock() delete this->Internal; } -int vtkGroupAsMultiBlock::RequestInformation(vtkInformation *request, vtkInformationVector **inputVector, vtkInformationVector *outputVector) +int vtkGroupAsMultiBlock::RequestInformation(vtkInformation */*request*/, vtkInformationVector **inputVector, vtkInformationVector */*outputVector*/) { - vtkInformation *outInfo(outputVector->GetInformationObject(0)); + //vtkInformation *outInfo(outputVector->GetInformationObject(0)); // todo: unused vtkInformation *inputInfo(inputVector[0]->GetInformationObject(0)); if(!ExtractGroupInternal::IndependantIsInformationOK(vtkMEDReader::META_DATA(),inputInfo)) { @@ -83,7 +83,7 @@ int vtkGroupAsMultiBlock::RequestData(vtkInformation *vtkNotUsed(request), vtkIn return 0; } vtkDataSet *input(vtkDataSet::SafeDownCast(inputMB->GetBlock(0))); - vtkInformation *info(input->GetInformation()); + //vtkInformation *info(input->GetInformation()); // todo: unused vtkInformation *outInfo(outputVector->GetInformationObject(0)); vtkMultiBlockDataSet *output(vtkMultiBlockDataSet::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT()))); if(!output) diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupAsMultiBlock.h b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupAsMultiBlock.h index ccb266e7..bb7ffb6a 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupAsMultiBlock.h +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupAsMultiBlock.h @@ -28,11 +28,11 @@ class vtkGroupAsMultiBlock : public vtkMultiBlockDataSetAlgorithm { public: static vtkGroupAsMultiBlock *New(); - vtkTypeMacro(vtkGroupAsMultiBlock, vtkMultiBlockDataSetAlgorithm); + vtkTypeMacro(vtkGroupAsMultiBlock, vtkMultiBlockDataSetAlgorithm) protected: vtkGroupAsMultiBlock(); ~vtkGroupAsMultiBlock(); - int RequestInformation(vtkInformation *request, vtkInformationVector **inputVector, vtkInformationVector *outputVector) override; + int RequestInformation(vtkInformation * request, vtkInformationVector **inputVector, vtkInformationVector *outputVector) override; int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; private: ExtractGroupInternal *Internal; diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupsNames.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupsNames.cxx index 537710b8..cac47f89 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupsNames.cxx +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupsNames.cxx @@ -50,7 +50,7 @@ class vtkGroupsNamesInternal : public ExtractGroupInternal { }; -vtkStandardNewMacro(vtkGroupsNames); +vtkStandardNewMacro(vtkGroupsNames) vtkGroupsNames::vtkGroupsNames():Internal(new ExtractGroupInternal) { @@ -61,9 +61,9 @@ vtkGroupsNames::~vtkGroupsNames() delete this->Internal; } -int vtkGroupsNames::RequestInformation(vtkInformation *request, vtkInformationVector **inputVector, vtkInformationVector *outputVector) +int vtkGroupsNames::RequestInformation(vtkInformation * /*request*/, vtkInformationVector **inputVector, vtkInformationVector */*outputVector*/) { - vtkInformation *outInfo(outputVector->GetInformationObject(0)); + //vtkInformation *outInfo(outputVector->GetInformationObject(0)); // todo: unused vtkInformation *inputInfo(inputVector[0]->GetInformationObject(0)); if(!ExtractGroupInternal::IndependantIsInformationOK(vtkMEDReader::META_DATA(),inputInfo)) { @@ -98,7 +98,7 @@ int vtkGroupsNames::RequestData(vtkInformation *vtkNotUsed(request), vtkInformat vtkErrorMacro("vtkGroupsNames::RequestData : input is neither a DataSet nor a MultiblockDataSet !"); return 0; } - vtkInformation *info(input->GetInformation()); + //vtkInformation *info(input->GetInformation()); // todo: unused vtkInformation *outInfo(outputVector->GetInformationObject(0)); vtkTable *output(vtkTable::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT()))); if(!output) diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupsNames.h b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupsNames.h index 14af366e..09b01dba 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupsNames.h +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupsNames.h @@ -28,11 +28,11 @@ class vtkGroupsNames : public vtkTableAlgorithm { public: static vtkGroupsNames *New(); - vtkTypeMacro(vtkGroupsNames, vtkTableAlgorithm); + vtkTypeMacro(vtkGroupsNames, vtkTableAlgorithm) protected: vtkGroupsNames(); ~vtkGroupsNames(); - int RequestInformation(vtkInformation *request, vtkInformationVector **inputVector, vtkInformationVector *outputVector) override; + int RequestInformation(vtkInformation * request, vtkInformationVector **inputVector, vtkInformationVector *outputVector) override; int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; private: ExtractGroupInternal *Internal; diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkInformationGaussDoubleVectorKey.h b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkInformationGaussDoubleVectorKey.h index c280c035..47429cd5 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkInformationGaussDoubleVectorKey.h +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkInformationGaussDoubleVectorKey.h @@ -25,8 +25,8 @@ class VTK_EXPORT vtkInformationGaussDoubleVectorKey : public vtkInformationDoubleVectorKey { public: - vtkTypeMacro(vtkInformationGaussDoubleVectorKey, vtkInformationDoubleVectorKey); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE{} + vtkTypeMacro(vtkInformationGaussDoubleVectorKey, vtkInformationDoubleVectorKey) + void PrintSelf(ostream& /*os*/, vtkIndent /*indent*/) VTK_OVERRIDE{} vtkInformationGaussDoubleVectorKey(const char* name, const char* location, int length = -1) : vtkInformationDoubleVectorKey(name, location, length) { } @@ -46,7 +46,7 @@ public: * Simply shallow copies the key from fromInfo to toInfo. * This is used by the pipeline to propagate this key downstream. */ - void CopyDefaultInformation(vtkInformation* request, + void CopyDefaultInformation(vtkInformation* /*request*/, vtkInformation* fromInfo, vtkInformation* toInfo) VTK_OVERRIDE { diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkMEDQuadraturePointsGenerator.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkMEDQuadraturePointsGenerator.cxx index 0afd22b9..5666f36f 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkMEDQuadraturePointsGenerator.cxx +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkMEDQuadraturePointsGenerator.cxx @@ -33,7 +33,7 @@ #include //----------------------------------------------------------------------------- -vtkStandardNewMacro(vtkMEDQuadraturePointsGenerator); +vtkStandardNewMacro(vtkMEDQuadraturePointsGenerator) //----------------------------------------------------------------------------- vtkMEDQuadraturePointsGenerator::vtkMEDQuadraturePointsGenerator() diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkMEDQuadraturePointsGenerator.h b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkMEDQuadraturePointsGenerator.h index 392c71c2..30ab5750 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkMEDQuadraturePointsGenerator.h +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkMEDQuadraturePointsGenerator.h @@ -30,7 +30,7 @@ class vtkInformationVector; class VTK_EXPORT vtkMEDQuadraturePointsGenerator : public vtkQuadraturePointsGenerator { public: - vtkTypeMacro(vtkMEDQuadraturePointsGenerator,vtkQuadraturePointsGenerator); + vtkTypeMacro(vtkMEDQuadraturePointsGenerator,vtkQuadraturePointsGenerator) static vtkMEDQuadraturePointsGenerator *New(); protected: diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkMEDReader.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkMEDReader.cxx index 8cdaafbc..2739cd24 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkMEDReader.cxx +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkMEDReader.cxx @@ -215,7 +215,7 @@ private: unsigned char FirstCall0; }; -vtkStandardNewMacro(vtkMEDReader); +vtkStandardNewMacro(vtkMEDReader) // vtkInformationKeyMacro(vtkMEDReader, META_DATA, DataObjectMetaData); // Here we need to customize vtkMEDReader::META_DATA method // start of overload of vtkInformationKeyMacro @@ -389,7 +389,7 @@ char *vtkMEDReader::GetFileName() return const_cast(this->Internal->FileName.c_str()); } -int vtkMEDReader::RequestInformation(vtkInformation *request, vtkInformationVector **inputVector, vtkInformationVector *outputVector) +int vtkMEDReader::RequestInformation(vtkInformation *request, vtkInformationVector ** /*inputVector*/, vtkInformationVector *outputVector) { // std::cout << "########################################## vtkMEDReader::RequestInformation ##########################################" << std::endl; if(!this->Internal) @@ -422,7 +422,7 @@ int vtkMEDReader::RequestInformation(vtkInformation *request, vtkInformationVect return 1; } -int vtkMEDReader::RequestData(vtkInformation *request, vtkInformationVector **inputVector, vtkInformationVector *outputVector) +int vtkMEDReader::RequestData(vtkInformation *request, vtkInformationVector ** /*inputVector*/, vtkInformationVector *outputVector) { // std::cout << "########################################## vtkMEDReader::RequestData ##########################################" << std::endl; if(!this->Internal) @@ -432,7 +432,7 @@ int vtkMEDReader::RequestData(vtkInformation *request, vtkInformationVector **in // request->Print(cout); vtkInformation *outInfo(outputVector->GetInformationObject(0)); vtkMultiBlockDataSet *output(vtkMultiBlockDataSet::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT()))); - bool isUpdated(false); + //bool isUpdated(false); // todo: unused double reqTS(0.); if(outInfo->Has(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEP())) reqTS=outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEP()); @@ -582,7 +582,7 @@ int vtkMEDReader::GetTimesFlagsArrayStatus(const char *name) return (int)this->Internal->TK.getTimesFlagArray()[pos].first; } -void vtkMEDReader::UpdateSIL(vtkInformation* request, vtkInformation *info) +void vtkMEDReader::UpdateSIL(vtkInformation* /*request*/, vtkInformation * /*info*/) { if(!this->Internal) return; diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkMEDReader.h b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkMEDReader.h index a142ff5b..4d0b361e 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkMEDReader.h +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkMEDReader.h @@ -39,7 +39,7 @@ class VTK_EXPORT vtkMEDReader : public vtkMultiBlockDataSetAlgorithm void operator=(const vtkMEDReader&); // Not implemented. public: static vtkMEDReader *New(); - vtkTypeMacro(vtkMEDReader, vtkMultiBlockDataSetAlgorithm); + vtkTypeMacro(vtkMEDReader, vtkMultiBlockDataSetAlgorithm) void PrintSelf(ostream& os, vtkIndent indent); virtual void SetFileName(const char*); virtual char *GetFileName(); @@ -80,7 +80,7 @@ class VTK_EXPORT vtkMEDReader : public vtkMultiBlockDataSetAlgorithm virtual int RequestInformation(vtkInformation*, vtkInformationVector**, vtkInformationVector*); virtual int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*); private: - void UpdateSIL(vtkInformation *request, vtkInformation *info); + void UpdateSIL(vtkInformation * request, vtkInformation * info); virtual double PublishTimeStepsIfNeeded(vtkInformation*, bool& isUpdated); virtual void FillMultiBlockDataSetInstance(vtkMultiBlockDataSet *output, double reqTS, ExportedTinyInfo *internalInfo=0); vtkDataSet *RetrieveDataSetAtTime(double reqTS, ExportedTinyInfo *internalInfo); diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkPVMetaDataInformation.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkPVMetaDataInformation.cxx index b3d3de04..0ef4240d 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkPVMetaDataInformation.cxx +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkPVMetaDataInformation.cxx @@ -33,8 +33,8 @@ #include "vtkMEDReader.h" -vtkStandardNewMacro(vtkPVMetaDataInformation); -vtkCxxSetObjectMacro(vtkPVMetaDataInformation, InformationData, vtkDataObject); +vtkStandardNewMacro(vtkPVMetaDataInformation) +vtkCxxSetObjectMacro(vtkPVMetaDataInformation, InformationData, vtkDataObject) //---------------------------------------------------------------------------- vtkPVMetaDataInformation::vtkPVMetaDataInformation() diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkPVMetaDataInformation.h b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkPVMetaDataInformation.h index 8002aeb9..3dc757b6 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkPVMetaDataInformation.h +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkPVMetaDataInformation.h @@ -30,7 +30,7 @@ class vtkPVMetaDataInformation : public vtkPVInformation { public: static vtkPVMetaDataInformation* New(); - vtkTypeMacro(vtkPVMetaDataInformation, vtkPVInformation); + vtkTypeMacro(vtkPVMetaDataInformation, vtkPVInformation) void PrintSelf(ostream& os, vtkIndent indent); // Description: diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkUgSelectCellIds.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkUgSelectCellIds.cxx index a92ec286..c5b071c7 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkUgSelectCellIds.cxx +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkUgSelectCellIds.cxx @@ -28,7 +28,7 @@ #include "vtkCellData.h" #include "vtkPointData.h" -vtkStandardNewMacro(vtkUgSelectCellIds); +vtkStandardNewMacro(vtkUgSelectCellIds) void vtkUgSelectCellIds::SetIds(vtkIdTypeArray *ids) { diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkUgSelectCellIds.h b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkUgSelectCellIds.h index acff0c5e..5a1bea65 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkUgSelectCellIds.h +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkUgSelectCellIds.h @@ -33,7 +33,7 @@ class vtkUgSelectCellIds : public vtkUnstructuredGridAlgorithm { public: static vtkUgSelectCellIds* New(); - vtkTypeMacro(vtkUgSelectCellIds, vtkUnstructuredGridAlgorithm); + vtkTypeMacro(vtkUgSelectCellIds, vtkUnstructuredGridAlgorithm) void SetIds(vtkIdTypeArray *ids); vtkUgSelectCellIds() = default; ~vtkUgSelectCellIds() override = default; diff --git a/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqAbstractFieldsWidget.cxx b/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqAbstractFieldsWidget.cxx index 82711f69..c067b8d8 100644 --- a/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqAbstractFieldsWidget.cxx +++ b/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqAbstractFieldsWidget.cxx @@ -28,7 +28,7 @@ #include //----------------------------------------------------------------------------- pqAbstractFieldsWidget::pqAbstractFieldsWidget( - vtkSMProxy *smproxy, vtkSMProperty *smproperty, QWidget *parentObject) + vtkSMProxy *smproxy, vtkSMProperty * /*smproperty*/, QWidget *parentObject) : Superclass(smproxy, parentObject) { this->NItems = 0; @@ -86,7 +86,7 @@ QSize pqAbstractFieldsWidget::sizeHint() const } //----------------------------------------------------------------------------- -void pqAbstractFieldsWidget::onItemChanged(QTreeWidgetItem* item, int column) const +void pqAbstractFieldsWidget::onItemChanged(QTreeWidgetItem* /*item*/, int column) const { if (column != 0) { diff --git a/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqAbstractFieldsWidget.h b/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqAbstractFieldsWidget.h index 99b8e1e4..b5874945 100644 --- a/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqAbstractFieldsWidget.h +++ b/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqAbstractFieldsWidget.h @@ -43,7 +43,7 @@ class pqAbstractFieldsWidget : public pqPropertyWidget Q_PROPERTY(QList< QList< QVariant> > fieldsDomain READ getFields WRITE setFieldsDomain) public: pqAbstractFieldsWidget( - vtkSMProxy *smproxy, vtkSMProperty *smproperty, QWidget *parentObject = 0); + vtkSMProxy *smproxy, vtkSMProperty * smproperty, QWidget *parentObject = 0); virtual ~pqAbstractFieldsWidget(); // Description @@ -97,7 +97,7 @@ protected slots: virtual void onItemChanged(QTreeWidgetItem* itemOrig, int column) const; private: - Q_DISABLE_COPY(pqAbstractFieldsWidget); + Q_DISABLE_COPY(pqAbstractFieldsWidget) }; #endif diff --git a/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqExtractGroupFieldsWidget.h b/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqExtractGroupFieldsWidget.h index 3fb5fb21..1f8c300d 100644 --- a/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqExtractGroupFieldsWidget.h +++ b/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqExtractGroupFieldsWidget.h @@ -42,7 +42,7 @@ protected: void loadTreeWidgetItems(); private: - Q_DISABLE_COPY(pqExtractGroupFieldsWidget); + Q_DISABLE_COPY(pqExtractGroupFieldsWidget) }; #endif diff --git a/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqMEDReaderFieldsWidget.h b/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqMEDReaderFieldsWidget.h index 8999666e..cbcbbc86 100644 --- a/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqMEDReaderFieldsWidget.h +++ b/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqMEDReaderFieldsWidget.h @@ -64,7 +64,7 @@ protected slots: void updateChecks(); private: - Q_DISABLE_COPY(pqMEDReaderFieldsWidget); + Q_DISABLE_COPY(pqMEDReaderFieldsWidget) }; #endif diff --git a/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqMEDReaderTimeModeWidget.h b/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqMEDReaderTimeModeWidget.h index cf49eb94..a281e739 100644 --- a/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqMEDReaderTimeModeWidget.h +++ b/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqMEDReaderTimeModeWidget.h @@ -51,7 +51,7 @@ signals: void modeEnabled(bool enable); private: - Q_DISABLE_COPY(pqMEDReaderTimeModeWidget); + Q_DISABLE_COPY(pqMEDReaderTimeModeWidget) // Description // Qt property value diff --git a/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqMEDReaderTimesFlagsWidget.h b/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqMEDReaderTimesFlagsWidget.h index f7eac37d..cb1538f2 100644 --- a/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqMEDReaderTimesFlagsWidget.h +++ b/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqMEDReaderTimesFlagsWidget.h @@ -85,7 +85,7 @@ protected: vtkIdType CachedTsId; private: - Q_DISABLE_COPY(pqMEDReaderTimesFlagsWidget); + Q_DISABLE_COPY(pqMEDReaderTimesFlagsWidget) }; #endif diff --git a/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqMEDReaderVectorsWidget.h b/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqMEDReaderVectorsWidget.h index f14047e6..10eb4bc5 100644 --- a/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqMEDReaderVectorsWidget.h +++ b/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqMEDReaderVectorsWidget.h @@ -33,7 +33,7 @@ public: virtual ~pqMEDReaderVectorsWidget(); private: - Q_DISABLE_COPY(pqMEDReaderVectorsWidget); + Q_DISABLE_COPY(pqMEDReaderVectorsWidget) class pqInternals; pqInternals* Internals; diff --git a/src/Plugins/MEDWriter/plugin/MEDWriterIO/VTKToMEDMem.cxx b/src/Plugins/MEDWriter/plugin/MEDWriterIO/VTKToMEDMem.cxx index 9c424df5..b2522add 100644 --- a/src/Plugins/MEDWriter/plugin/MEDWriterIO/VTKToMEDMem.cxx +++ b/src/Plugins/MEDWriter/plugin/MEDWriterIO/VTKToMEDMem.cxx @@ -264,7 +264,7 @@ MEDCouplingUMesh *BuildMeshFromCellArray(vtkCellArray *ca, DataArrayDouble *coor int nbCells(ca->GetNumberOfCells()); if(nbCells==0) return 0; - vtkIdType nbEntries(ca->GetNumberOfConnectivityEntries()); + //vtkIdType nbEntries(ca->GetNumberOfConnectivityEntries()); // todo: unused const vtkIdType *conn(ca->GetData()->GetPointer(0)); for(int i=0;iGetNumberOfCells()); if(nbCells==0) return 0; - vtkIdType nbEntries(ca->GetNumberOfConnectivityEntries()); + //vtkIdType nbEntries(ca->GetNumberOfConnectivityEntries()); // todo: unused const vtkIdType *conn(ca->GetData()->GetPointer(0)); ids=DataArrayIdType::New() ; ids->alloc(0,1); for(int i=0;i mesh(mf.getMesh()); mesh->setName(mfd->getMeshes()->getMeshAtPos(0)->getName()); MCAuto o2n(mesh->sortCellsInMEDFileFrmt()); - const DataArrayIdType *o2nPtr(o2n); + //const DataArrayIdType *o2nPtr(o2n); // todo: unused MCAuto n2o; mmu->setMeshAtLevel(meshDimRel,mesh); const DataArrayIdType *n2oPtr(0); @@ -570,8 +570,8 @@ std::vector > AddPartFields(const DataArrayIdType *part, vtkDa if(!arr) continue; const char *name(arr->GetName()); - int nbCompo(arr->GetNumberOfComponents()); - vtkIdType nbTuples(arr->GetNumberOfTuples()); + //int nbCompo(arr->GetNumberOfComponents()); // todo: unused + //vtkIdType nbTuples(arr->GetNumberOfTuples()); // todo: unused MCAuto mcarr(ConvertVTKArrayToMCArray(arr)); if(part) mcarr=mcarr->selectByTupleId(part->begin(),part->end()); @@ -593,8 +593,8 @@ std::vector > AddPartFields2(int bg, int end, vtkDataSetAttrib if(!arr) continue; const char *name(arr->GetName()); - int nbCompo(arr->GetNumberOfComponents()); - vtkIdType nbTuples(arr->GetNumberOfTuples()); + //int nbCompo(arr->GetNumberOfComponents()); // todo: unused + //vtkIdType nbTuples(arr->GetNumberOfTuples()); // todo: unused MCAuto mcarr(ConvertVTKArrayToMCArray(arr)); mcarr=mcarr->selectByTupleIdSafeSlice(bg,end,1); mcarr->setName(name); @@ -744,13 +744,13 @@ void ConvertFromUnstructuredGrid(MEDFileData *ret, vtkUnstructuredGrid *ds, cons vtkCellArray *ca(ds->GetCells()); if(!ca) return ; - vtkIdType nbEnt(ca->GetNumberOfConnectivityEntries()); - vtkIdType *caPtr(ca->GetData()->GetPointer(0)); + //vtkIdType nbEnt(ca->GetNumberOfConnectivityEntries()); // todo: unused + //vtkIdType *caPtr(ca->GetData()->GetPointer(0)); // todo: unused vtkUnsignedCharArray *ct(ds->GetCellTypesArray()); if(!ct) throw MZCException("ConvertFromUnstructuredGrid : internal error"); vtkIdTypeArray *cla(ds->GetCellLocationsArray()); - const vtkIdType *claPtr(cla->GetPointer(0)); + //const vtkIdType *claPtr(cla->GetPointer(0)); // todo: unused if(!cla) throw MZCException("ConvertFromUnstructuredGrid : internal error 2"); const unsigned char *ctPtr(ct->GetPointer(0)); @@ -779,10 +779,9 @@ void ConvertFromUnstructuredGrid(MEDFileData *ret, vtkUnstructuredGrid *ds, cons } } } - int dummy(0); MCAuto levs(lev->getDifferentValues()); std::vector< MicroField > ms; - vtkIdTypeArray *faces(ds->GetFaces()),*faceLoc(ds->GetFaceLocations()); + //vtkIdTypeArray *faces(ds->GetFaces()),*faceLoc(ds->GetFaceLocations()); // todo: unused for(const int *curLev=levs->begin();curLev!=levs->end();curLev++) { MCAuto m0(MEDCouplingUMesh::New("",*curLev)); diff --git a/src/Plugins/MEDWriter/plugin/MEDWriterIO/VTKToMEDMem.h b/src/Plugins/MEDWriter/plugin/MEDWriterIO/VTKToMEDMem.h index 8256941d..19937280 100644 --- a/src/Plugins/MEDWriter/plugin/MEDWriterIO/VTKToMEDMem.h +++ b/src/Plugins/MEDWriter/plugin/MEDWriterIO/VTKToMEDMem.h @@ -44,8 +44,8 @@ class VTK_EXPORT MZCException : public std::exception { public: MZCException(const std::string& s):_reason(s) { } - virtual const char *what() const throw() { return _reason.c_str(); } - virtual ~MZCException() throw() { } + virtual const char *what() const noexcept { return _reason.c_str(); } + virtual ~MZCException() noexcept { } private: std::string _reason; }; diff --git a/src/Plugins/MEDWriter/plugin/MEDWriterIO/vtkMEDWriter.cxx b/src/Plugins/MEDWriter/plugin/MEDWriterIO/vtkMEDWriter.cxx index d44702ab..a3905daf 100644 --- a/src/Plugins/MEDWriter/plugin/MEDWriterIO/vtkMEDWriter.cxx +++ b/src/Plugins/MEDWriter/plugin/MEDWriterIO/vtkMEDWriter.cxx @@ -70,7 +70,7 @@ #include #include -vtkStandardNewMacro(vtkMEDWriter); +vtkStandardNewMacro(vtkMEDWriter) using MEDCoupling::MCAuto; using MEDCoupling::MEDFileData; @@ -140,7 +140,6 @@ void LoadFamGrpMapInfo(vtkMutableDirectedGraph* sil, std::string& meshName, "There is an internal error ! The tree on server side has not the expected look !"); vtkAdjacentVertexIterator* it0(vtkAdjacentVertexIterator::New()); sil->GetAdjacentVertices(id0, it0); - int kk(0), ll(0); while (it0->HasNext()) { vtkIdType id1(it0->Next()); @@ -194,7 +193,7 @@ vtkMEDWriter::vtkMEDWriter() vtkMEDWriter::~vtkMEDWriter() {} int vtkMEDWriter::RequestInformation( - vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector) + vtkInformation* /*request*/, vtkInformationVector** inputVector, vtkInformationVector* /*outputVector*/) { // std::cerr << "########################################## vtkMEDWriter::RequestInformation // ########################################## " << (const char *) this->FileName << std::endl; diff --git a/src/Plugins/MEDWriter/plugin/MEDWriterIO/vtkMEDWriter.h b/src/Plugins/MEDWriter/plugin/MEDWriterIO/vtkMEDWriter.h index 67b20d6a..02381552 100644 --- a/src/Plugins/MEDWriter/plugin/MEDWriterIO/vtkMEDWriter.h +++ b/src/Plugins/MEDWriter/plugin/MEDWriterIO/vtkMEDWriter.h @@ -42,7 +42,7 @@ protected: vtkMEDWriter(); ~vtkMEDWriter(); - int RequestInformation(vtkInformation *request, vtkInformationVector **inputVector, vtkInformationVector *outputVector); + int RequestInformation(vtkInformation * request, vtkInformationVector **inputVector, vtkInformationVector * outputVector); int RequestData(vtkInformation *request, vtkInformationVector **inputVector, vtkInformationVector *outputVector); int RequestUpdateExtent(vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector); private: diff --git a/src/Plugins/ParaGEOMCorba/plugin/ParaGEOMCorbaModule/vtkParaGEOMCorbaSource.cxx b/src/Plugins/ParaGEOMCorba/plugin/ParaGEOMCorbaModule/vtkParaGEOMCorbaSource.cxx index 7263b0ce..6202c8c7 100644 --- a/src/Plugins/ParaGEOMCorba/plugin/ParaGEOMCorbaModule/vtkParaGEOMCorbaSource.cxx +++ b/src/Plugins/ParaGEOMCorba/plugin/ParaGEOMCorbaModule/vtkParaGEOMCorbaSource.cxx @@ -38,7 +38,7 @@ #include //---------------------------------------------- -vtkStandardNewMacro(vtkParaGEOMCorbaSource); +vtkStandardNewMacro(vtkParaGEOMCorbaSource) void *vtkParaGEOMCorbaSource::Orb=0; @@ -95,12 +95,13 @@ int vtkParaGEOMCorbaSource::FillOutputPortInformation(int vtkNotUsed(port), vtkI } //---------------------------------------------- -int vtkParaGEOMCorbaSource::RequestData(vtkInformation* request, vtkInformationVector** inInfo, vtkInformationVector* outputVector) { +int vtkParaGEOMCorbaSource::RequestData(vtkInformation* /*request*/, vtkInformationVector** /*inInfo*/, vtkInformationVector* outputVector) { vtkInformation *outInfo=outputVector->GetInformationObject(0); vtkMultiBlockDataSet *ret0=vtkMultiBlockDataSet::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())); - double reqTS = 0; + /*double reqTS = 0; // todo: unused if(outInfo->Has(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEP())) reqTS = outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEP()); + */ try { //Client request on ORB. CORBA::ORB_var *OrbC=(CORBA::ORB_var *)this->Orb; diff --git a/src/Plugins/ParaGEOMCorba/plugin/ParaGEOMCorbaModule/vtkParaGEOMCorbaSource.h b/src/Plugins/ParaGEOMCorba/plugin/ParaGEOMCorbaModule/vtkParaGEOMCorbaSource.h index 96affb13..a0e39d5a 100644 --- a/src/Plugins/ParaGEOMCorba/plugin/ParaGEOMCorbaModule/vtkParaGEOMCorbaSource.h +++ b/src/Plugins/ParaGEOMCorba/plugin/ParaGEOMCorbaModule/vtkParaGEOMCorbaSource.h @@ -27,7 +27,7 @@ class vtkParaGEOMCorbaSource : public vtkAlgorithm { public: static vtkParaGEOMCorbaSource* New(); - vtkTypeMacro(vtkParaGEOMCorbaSource, vtkAlgorithm); + vtkTypeMacro(vtkParaGEOMCorbaSource, vtkAlgorithm) virtual void PrintSelf( ostream& os, vtkIndent indent ); const char *GetIORCorba(); void SetIORCorba(char *ior); diff --git a/src/Plugins/ParaMEDCorba/plugin/ParaMEDCorbaModule/vtkParaMEDCorbaSource.cxx b/src/Plugins/ParaMEDCorba/plugin/ParaMEDCorbaModule/vtkParaMEDCorbaSource.cxx index 002ba6a3..59361984 100644 --- a/src/Plugins/ParaMEDCorba/plugin/ParaMEDCorbaModule/vtkParaMEDCorbaSource.cxx +++ b/src/Plugins/ParaMEDCorba/plugin/ParaMEDCorbaModule/vtkParaMEDCorbaSource.cxx @@ -48,7 +48,7 @@ #include "ParaMEDCouplingCorbaServant.hh" // -vtkStandardNewMacro(vtkParaMEDCorbaSource); +vtkStandardNewMacro(vtkParaMEDCorbaSource) //vtkCxxRevisionMacro(vtkParaMEDCorbaSource,"$Revision$"); void *vtkParaMEDCorbaSource::Orb=0; @@ -137,7 +137,7 @@ int vtkParaMEDCorbaSource::FillOutputPortInformation(int vtkNotUsed(port), vtkIn return 1; } -int vtkParaMEDCorbaSource::RequestInformation(vtkInformation* request, vtkInformationVector** inInfo, vtkInformationVector* outInfo) +int vtkParaMEDCorbaSource::RequestInformation(vtkInformation* /*request*/, vtkInformationVector** /*inInfo*/, vtkInformationVector* outInfo) { vtkInformation* myInfo=outInfo->GetInformationObject(0); //myInfo->Set(vtkDataObject::DATA_TYPE_NAME(),"vtkUnstructuredGrid"); @@ -188,7 +188,7 @@ int vtkParaMEDCorbaSource::RequestInformation(vtkInformation* request, vtkInform return 1; } -int vtkParaMEDCorbaSource::RequestData(vtkInformation* request, vtkInformationVector** inInfo, vtkInformationVector* outputVector) +int vtkParaMEDCorbaSource::RequestData(vtkInformation* /*request*/, vtkInformationVector** /*inInfo*/, vtkInformationVector* outputVector) { vtkInformation *outInfo=outputVector->GetInformationObject(0); // @@ -273,6 +273,7 @@ int vtkParaMEDCorbaSource::RequestData(vtkInformation* request, vtkInformationVe catch(CORBA::Exception&) { vtkErrorMacro("On fetching object error occurs"); } + return 0; } void vtkParaMEDCorbaSource::PrintSelf(ostream& os, vtkIndent indent) diff --git a/src/Plugins/ParaMEDCorba/plugin/ParaMEDMEM2VTK/VTKMEDCouplingCurveLinearMeshClient.cxx b/src/Plugins/ParaMEDCorba/plugin/ParaMEDMEM2VTK/VTKMEDCouplingCurveLinearMeshClient.cxx index 95697cfa..714154f6 100644 --- a/src/Plugins/ParaMEDCorba/plugin/ParaMEDMEM2VTK/VTKMEDCouplingCurveLinearMeshClient.cxx +++ b/src/Plugins/ParaMEDCorba/plugin/ParaMEDMEM2VTK/VTKMEDCouplingCurveLinearMeshClient.cxx @@ -54,7 +54,7 @@ void ParaMEDMEM2VTK::FillMEDCouplingCurveLinearMeshInstanceFrom(SALOME_MED::MEDC SALOME_TYPES::ListOfDouble *bigD; meshPtr->getSerialisationData(tinyI,bigD); delete tinyI; - if(bigD->length()!=nbOfNodes*spaceDim) + if((int)bigD->length()!=nbOfNodes*spaceDim) vtkErrorWithObjectMacro(ret,"Internal error in ParaMEDCorba plugin : distant curvilinear mesh, mismatch between informations ! Internal error !"); for(int i=0;i::iterator it=std::find_if(_time_label_per_field.begin(),_time_label_per_field.end(), - std::bind2nd(std::greater(),t)); + std::bind(std::greater(),std::placeholders::_1,t)); if(it!=_time_label_per_field.end() && it!=_time_label_per_field.end()) return std::distance(_time_label_per_field.begin(),it); // diff --git a/src/Plugins/ParaMEDCorba/plugin/ParaMEDMEM2VTK/VTKMEDCouplingUMeshClient.cxx b/src/Plugins/ParaMEDCorba/plugin/ParaMEDMEM2VTK/VTKMEDCouplingUMeshClient.cxx index ba44eddb..1f7ca414 100644 --- a/src/Plugins/ParaMEDCorba/plugin/ParaMEDMEM2VTK/VTKMEDCouplingUMeshClient.cxx +++ b/src/Plugins/ParaMEDCorba/plugin/ParaMEDMEM2VTK/VTKMEDCouplingUMeshClient.cxx @@ -43,9 +43,9 @@ void ParaMEDMEM2VTK::FillMEDCouplingUMeshInstanceFrom(SALOME_MED::MEDCouplingUMe // int spaceDim=(*tinyI)[1]; int nbOfNodes=(*tinyI)[2]; - int meshDim=(*tinyI)[5]; + //int meshDim=(*tinyI)[5]; // todo: unused int nbOfCells=(*tinyI)[6]; - int meshLength=(*tinyI)[7]; + //int meshLength=(*tinyI)[7]; // todo: unused std::string name((*tinyS)[0]); //std::vector compoNames(spaceDim); //for(int i=0;i -vtkStandardNewMacro(vtkParaSMESHCorbaSource); +vtkStandardNewMacro(vtkParaSMESHCorbaSource) void *vtkParaSMESHCorbaSource::Orb=0; @@ -90,13 +90,14 @@ int vtkParaSMESHCorbaSource::FillOutputPortInformation(int vtkNotUsed(port), vtk } //---------------------------------------------- -int vtkParaSMESHCorbaSource::RequestData(vtkInformation* request, vtkInformationVector** inInfo, vtkInformationVector* outputVector) { +int vtkParaSMESHCorbaSource::RequestData(vtkInformation* /*request*/, vtkInformationVector** /*inInfo*/, vtkInformationVector* outputVector) { vtkInformation *outInfo=outputVector->GetInformationObject(0); vtkMultiBlockDataSet *ret0=vtkMultiBlockDataSet::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())); + /* todo: unused double reqTS = 0; if(outInfo->Has(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEP())) reqTS = outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEP()); - + */ try { CORBA::ORB_var *OrbC=(CORBA::ORB_var *)this->Orb; CORBA::Object_var obj=(*OrbC)->string_to_object(&IOR[0]); diff --git a/src/Plugins/ParaSMESHCorba/plugin/ParaSMESHCorbaModule/vtkParaSMESHCorbaSource.h b/src/Plugins/ParaSMESHCorba/plugin/ParaSMESHCorbaModule/vtkParaSMESHCorbaSource.h index 8e35f661..cd29c266 100644 --- a/src/Plugins/ParaSMESHCorba/plugin/ParaSMESHCorbaModule/vtkParaSMESHCorbaSource.h +++ b/src/Plugins/ParaSMESHCorba/plugin/ParaSMESHCorbaModule/vtkParaSMESHCorbaSource.h @@ -27,7 +27,7 @@ class vtkParaSMESHCorbaSource: public vtkAlgorithm { public: static vtkParaSMESHCorbaSource* New(); - vtkTypeMacro(vtkParaSMESHCorbaSource, vtkAlgorithm); + vtkTypeMacro(vtkParaSMESHCorbaSource, vtkAlgorithm) const char *GetIORCorba(); diff --git a/src/Plugins/ScaleVector/plugin/ScaleVectorModule/vtkScaleVectorFilter.cxx b/src/Plugins/ScaleVector/plugin/ScaleVectorModule/vtkScaleVectorFilter.cxx index ec9edbda..1f9743fe 100644 --- a/src/Plugins/ScaleVector/plugin/ScaleVectorModule/vtkScaleVectorFilter.cxx +++ b/src/Plugins/ScaleVector/plugin/ScaleVectorModule/vtkScaleVectorFilter.cxx @@ -31,7 +31,7 @@ using namespace std; // vtkCxxRevisionMacro(vtkScaleVectorFilter, "$Revision$"); -vtkStandardNewMacro(vtkScaleVectorFilter); +vtkStandardNewMacro(vtkScaleVectorFilter) vtkScaleVectorFilter::vtkScaleVectorFilter() { diff --git a/src/Plugins/ScaleVector/plugin/ScaleVectorModule/vtkScaleVectorFilter.h b/src/Plugins/ScaleVector/plugin/ScaleVectorModule/vtkScaleVectorFilter.h index 83b676db..4893ef15 100644 --- a/src/Plugins/ScaleVector/plugin/ScaleVectorModule/vtkScaleVectorFilter.h +++ b/src/Plugins/ScaleVector/plugin/ScaleVectorModule/vtkScaleVectorFilter.h @@ -26,7 +26,7 @@ class VTK_EXPORT vtkScaleVectorFilter : public vtkPassInputTypeAlgorithm { public: static vtkScaleVectorFilter* New(); - vtkTypeMacro(vtkScaleVectorFilter, vtkPassInputTypeAlgorithm); + vtkTypeMacro(vtkScaleVectorFilter, vtkPassInputTypeAlgorithm) void PrintSelf(ostream& os, vtkIndent indent) override; // Description : diff --git a/src/Plugins/SimpleMode/plugin/SimpleModeModule/vtkSimpleMode.cxx b/src/Plugins/SimpleMode/plugin/SimpleModeModule/vtkSimpleMode.cxx index 1a6ac09e..beaf6d4d 100644 --- a/src/Plugins/SimpleMode/plugin/SimpleModeModule/vtkSimpleMode.cxx +++ b/src/Plugins/SimpleMode/plugin/SimpleModeModule/vtkSimpleMode.cxx @@ -64,7 +64,7 @@ #include #include -vtkStandardNewMacro(vtkSimpleMode); +vtkStandardNewMacro(vtkSimpleMode) static const char ZE_DISPLACEMENT_NAME1[] = "@@ForReal?@@"; @@ -83,8 +83,8 @@ public: : _reason(s) { } - virtual const char* what() const throw() { return _reason.c_str(); } - virtual ~MZCException() throw() {} + virtual const char* what() const noexcept { return _reason.c_str(); } + virtual ~MZCException() noexcept {} private: std::string _reason; @@ -406,7 +406,7 @@ int vtkSimpleMode::FillOutputPortInformation(int vtkNotUsed(port), vtkInformatio } int vtkSimpleMode::RequestInformation( - vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector) + vtkInformation* /*request*/, vtkInformationVector** /*inputVector*/, vtkInformationVector* /*outputVector*/) { // std::cerr << "########################################## vtkSimpleMode::RequestInformation // ##########################################" << std::endl; @@ -441,7 +441,7 @@ int vtkSimpleMode::RequestInformation( } int vtkSimpleMode::RequestData( - vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector) + vtkInformation* /*request*/, vtkInformationVector** inputVector, vtkInformationVector* outputVector) { // std::cerr << "########################################## vtkSimpleMode::RequestData // ##########################################" << std::endl; @@ -497,7 +497,7 @@ int vtkSimpleMode::RequestData( continue; double* arrPtr(arr2->GetPointer(0)); std::transform(arrPtr, arrPtr + nbCompo * nbTuples, arrPtr, - std::bind2nd(std::multiplies(), cos(AnimationTime * 2 * M_PI))); + std::bind(std::multiplies(),std::placeholders::_1, cos(AnimationTime * 2 * M_PI))); } // vtkDataArray* array = output->GetPointData()->GetArray(idx2); diff --git a/src/Plugins/SimpleMode/plugin/SimpleModeModule/vtkSimpleMode.h b/src/Plugins/SimpleMode/plugin/SimpleModeModule/vtkSimpleMode.h index 9111561b..a9542f2e 100644 --- a/src/Plugins/SimpleMode/plugin/SimpleModeModule/vtkSimpleMode.h +++ b/src/Plugins/SimpleMode/plugin/SimpleModeModule/vtkSimpleMode.h @@ -29,7 +29,7 @@ class VTK_EXPORT vtkSimpleMode : public vtkDataSetAlgorithm { public: static vtkSimpleMode* New(); - vtkTypeMacro(vtkSimpleMode, vtkDataSetAlgorithm); + vtkTypeMacro(vtkSimpleMode, vtkDataSetAlgorithm) void PrintSelf(ostream& os, vtkIndent indent) override; void SetInputArrayToProcess( diff --git a/src/Plugins/VoroGauss/plugin/VoroGaussModule/vtkVoroGauss.cxx b/src/Plugins/VoroGauss/plugin/VoroGaussModule/vtkVoroGauss.cxx index e583f634..45377595 100644 --- a/src/Plugins/VoroGauss/plugin/VoroGaussModule/vtkVoroGauss.cxx +++ b/src/Plugins/VoroGauss/plugin/VoroGaussModule/vtkVoroGauss.cxx @@ -87,7 +87,7 @@ using MEDCoupling::MEDCouplingFieldDouble; using MEDCoupling::ON_GAUSS_PT; using MEDCoupling::MCAuto; -vtkStandardNewMacro(vtkVoroGauss); +vtkStandardNewMacro(vtkVoroGauss) /////////////////// std::map ComputeMapOfType() @@ -287,13 +287,13 @@ void ConvertFromUnstructuredGrid(vtkUnstructuredGrid *ds, std::vector< MCAutoGetCells()); if(!ca) return ; - vtkIdType nbEnt(ca->GetNumberOfConnectivityEntries()); - vtkIdType *caPtr(ca->GetData()->GetPointer(0)); + //vtkIdType nbEnt(ca->GetNumberOfConnectivityEntries()); // todo: unused + //vtkIdType *caPtr(ca->GetData()->GetPointer(0)); // todo: unused vtkUnsignedCharArray *ct(ds->GetCellTypesArray()); if(!ct) throw INTERP_KERNEL::Exception("ConvertFromUnstructuredGrid : internal error"); vtkIdTypeArray *cla(ds->GetCellLocationsArray()); - const vtkIdType *claPtr(cla->GetPointer(0)); + //const vtkIdType *claPtr(cla->GetPointer(0)); // todo: unused if(!cla) throw INTERP_KERNEL::Exception("ConvertFromUnstructuredGrid : internal error 2"); const unsigned char *ctPtr(ct->GetPointer(0)); @@ -315,7 +315,7 @@ void ConvertFromUnstructuredGrid(vtkUnstructuredGrid *ds, std::vector< MCAuto levs(lev->getDifferentValues()); - vtkIdTypeArray *faces(ds->GetFaces()),*faceLoc(ds->GetFaceLocations()); + //vtkIdTypeArray *faces(ds->GetFaces()),*faceLoc(ds->GetFaceLocations()); // todo: unused for(const int *curLev=levs->begin();curLev!=levs->end();curLev++) { MCAuto m0(MEDCouplingUMesh::New("",*curLev)); @@ -660,7 +660,7 @@ vtkSmartPointer Voronize(const MEDCouplingUMesh *m, const D throw INTERP_KERNEL::Exception(oss.str()); } int np(gaussLoc->GetNumberOfQuadraturePoints()),nbPtsPerCell((int)cm.getNumberOfNodes()); - const double *sfw(gaussLoc->GetShapeFunctionWeights()),*w(gaussLoc->GetQuadratureWeights());; + const double /**sfw(gaussLoc->GetShapeFunctionWeights()),*/*w(gaussLoc->GetQuadratureWeights());; // todo: sfw is unused std::vector refCoo,posInRefCoo,wCpp(w,w+np); FillAdvInfoFrom((*it2).second,GaussAdvData,np,nbPtsPerCell,refCoo,posInRefCoo); field->setGaussLocalizationOnType(*it,refCoo,posInRefCoo,wCpp); @@ -838,7 +838,7 @@ vtkVoroGauss::~vtkVoroGauss() { } -int vtkVoroGauss::RequestInformation(vtkInformation *request, vtkInformationVector **inputVector, vtkInformationVector *outputVector) +int vtkVoroGauss::RequestInformation(vtkInformation * /*request*/, vtkInformationVector **inputVector, vtkInformationVector * /*outputVector*/) { //std::cerr << "########################################## vtkVoroGauss::RequestInformation ##########################################" << std::endl; try @@ -860,7 +860,7 @@ int vtkVoroGauss::RequestInformation(vtkInformation *request, vtkInformationVect return 1; } -int vtkVoroGauss::RequestData(vtkInformation *request, vtkInformationVector **inputVector, vtkInformationVector *outputVector) +int vtkVoroGauss::RequestData(vtkInformation * /*request*/, vtkInformationVector **inputVector, vtkInformationVector *outputVector) { //std::cerr << "########################################## vtkVoroGauss::RequestData ##########################################" << std::endl; try @@ -874,7 +874,7 @@ int vtkVoroGauss::RequestData(vtkInformation *request, vtkInformationVector **in ExtractInfo(inputVector[0],usgIn); // vtkSmartPointer ret(ComputeVoroGauss(usgIn,GaussAdvData)); - vtkInformation *inInfo(inputVector[0]->GetInformationObject(0)); + //vtkInformation *inInfo(inputVector[0]->GetInformationObject(0)); // todo: unused vtkInformation *outInfo(outputVector->GetInformationObject(0)); vtkUnstructuredGrid *output(vtkUnstructuredGrid::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT()))); output->ShallowCopy(ret); diff --git a/src/Plugins/VoroGauss/plugin/VoroGaussModule/vtkVoroGauss.h b/src/Plugins/VoroGauss/plugin/VoroGaussModule/vtkVoroGauss.h index 79c5a5e3..3b0e854e 100644 --- a/src/Plugins/VoroGauss/plugin/VoroGaussModule/vtkVoroGauss.h +++ b/src/Plugins/VoroGauss/plugin/VoroGaussModule/vtkVoroGauss.h @@ -29,7 +29,7 @@ class VTK_EXPORT vtkVoroGauss : public vtkUnstructuredGridAlgorithm { public: static vtkVoroGauss* New(); - vtkTypeMacro(vtkVoroGauss, vtkUnstructuredGridAlgorithm); + vtkTypeMacro(vtkVoroGauss, vtkUnstructuredGridAlgorithm) void PrintSelf(ostream& os, vtkIndent indent) override; protected: diff --git a/test/standalone/gui/PVViewer_Behaviors.cxx b/test/standalone/gui/PVViewer_Behaviors.cxx index beb2a9d5..b05bcb1b 100644 --- a/test/standalone/gui/PVViewer_Behaviors.cxx +++ b/test/standalone/gui/PVViewer_Behaviors.cxx @@ -61,7 +61,7 @@ PVViewer_Behaviors::PVViewer_Behaviors(QMainWindow * parent) * This method should be updated at each new version of ParaView with what is found in * Qt/ApplicationComponents/pqParaViewBehaviors.cxx */ -void PVViewer_Behaviors::instanciateMinimalBehaviors(QMainWindow * desk) +void PVViewer_Behaviors::instanciateMinimalBehaviors(QMainWindow * /*desk*/) { if (BehaviorLoadingLevel < 1) { diff --git a/test/standalone/gui/PVViewer_Core.cxx b/test/standalone/gui/PVViewer_Core.cxx index 081b0642..2ff678d2 100644 --- a/test/standalone/gui/PVViewer_Core.cxx +++ b/test/standalone/gui/PVViewer_Core.cxx @@ -57,7 +57,7 @@ pqPVApplicationCore * PVViewer_Core::GetPVApplication() \param fullSetup whether to instanciate all behaviors or just the minimal ones. \return \c true if ParaView has been initialized successfully, otherwise false */ -bool PVViewer_Core::ParaviewInitApp(QMainWindow * aDesktop, LogWindow * logWindow) +bool PVViewer_Core::ParaviewInitApp(QMainWindow * aDesktop, LogWindow * /*logWindow*/) { if ( ! MyCoreApp) { // Obtain command-line arguments diff --git a/test/standalone/gui/PVViewer_GUIElements.cxx b/test/standalone/gui/PVViewer_GUIElements.cxx index ff252f36..359a1876 100644 --- a/test/standalone/gui/PVViewer_GUIElements.cxx +++ b/test/standalone/gui/PVViewer_GUIElements.cxx @@ -96,7 +96,7 @@ pqTabbedMultiViewWidget * PVViewer_GUIElements::getTabbedMultiViewWidget() // Create a new view proxy on the server pqObjectBuilder* builder = pqApplicationCore::instance()->getObjectBuilder(); pqServer* active_serv = pqActiveObjects::instance().activeServer(); - pqView * pqview = builder->createView(QString("RenderView"), active_serv); + /*pqView * pqview = */builder->createView(QString("RenderView"), active_serv); // todo: unused } return multiv; diff --git a/test/standalone/simple/Container_init_python.cxx b/test/standalone/simple/Container_init_python.cxx index bdcef2da..ca9cb0b0 100644 --- a/test/standalone/simple/Container_init_python.cxx +++ b/test/standalone/simple/Container_init_python.cxx @@ -50,7 +50,7 @@ void KERNEL_PYTHON::init_python(int argc, char **argv) // set stdout to line buffering (aka C++ std::cout) setvbuf(stdout, (char *)NULL, _IOLBF, BUFSIZ); char* salome_python=getenv("SALOME_PYTHON"); - size_t size_salome_python = sizeof(salome_python) / sizeof(salome_python[0]); + //size_t size_salome_python = sizeof(salome_python) / sizeof(salome_python[0]); // unused if(salome_python != 0) Py_SetProgramName(Py_DecodeLocale(salome_python, NULL)); diff --git a/test/standalone/simple/PyInterp_Utils.h b/test/standalone/simple/PyInterp_Utils.h index 7b1c74d8..2075e681 100644 --- a/test/standalone/simple/PyInterp_Utils.h +++ b/test/standalone/simple/PyInterp_Utils.h @@ -60,9 +60,8 @@ public: */ ~PyLockWrapper() { - PyThreadState* _currState = PyGILState_GetThisThreadState(); #ifdef _DEBUG_ - if (_currState != _state) + if (PyGILState_GetThisThreadState() != _state) { std::cout << "!!!!!!!!! PyLockWrapper inconsistency - now entering infinite loop for debugging\n"; while(1); diff --git a/test/standalone/simple/simple_gil.cxx b/test/standalone/simple/simple_gil.cxx index edc9a010..29d95feb 100644 --- a/test/standalone/simple/simple_gil.cxx +++ b/test/standalone/simple/simple_gil.cxx @@ -37,9 +37,9 @@ int main(int argc, char ** argv) // Nothing important, just a bunch of calls to some Py* functions! PyRun_SimpleString("import base64"); - PyObject * sysmod = PyImport_AddModule("sys"); - PyObject* sysdict = PyModule_GetDict(sysmod); - PyObject* tmp = PyDict_GetItemString(sysdict, "modules"); + /*PyObject * sysmod = */PyImport_AddModule("sys"); // todo: unused + //PyObject* sysdict = PyModule_GetDict(sysmod); // todo: unused + //PyObject* tmp = PyDict_GetItemString(sysdict, "modules"); // todo: unused } std::cout << "Done with Py call" << std::endl;