diff --git a/CMakeLists.txt b/CMakeLists.txt index 3643452f2..f93ed2749 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -232,7 +232,7 @@ IF(WIN32) SET(SALOME_SMESH_ENABLE_MEFISTO ON) MESSAGE(STATUS "Build MEFISTO2D mesher using Fortran to C generator") ELSE(${F2C_FOUND}) - MESSAGE(STATUS "Fortran to C generator is not found: MEFISTO2D mesher will be unavailable.") + MESSAGE(FATAL "Fortran to C generator is not found: MEFISTO2D mesher cannot be compiled! Please define F2C_ROOT_DIR !") ENDIF(${F2C_FOUND}) ENDIF(WIN32) diff --git a/src/Controls/SMESH_Controls.cxx b/src/Controls/SMESH_Controls.cxx index fce25f698..e45fc2936 100644 --- a/src/Controls/SMESH_Controls.cxx +++ b/src/Controls/SMESH_Controls.cxx @@ -2045,7 +2045,7 @@ double Deflection2D::GetBadRate( double Value, int /*nbNodes*/ ) const */ //================================================================================ -double MultiConnection::GetValue( const TSequenceOfXYZ& P ) +double MultiConnection::GetValue( const TSequenceOfXYZ& /*P*/ ) { return 0; } @@ -2072,7 +2072,7 @@ SMDSAbs_ElementType MultiConnection::GetType() const */ //================================================================================ -double MultiConnection2D::GetValue( const TSequenceOfXYZ& P ) +double MultiConnection2D::GetValue( const TSequenceOfXYZ& /*P*/ ) { return 0; } @@ -4263,7 +4263,7 @@ private: bool isOutOfFace (const gp_Pnt& p); bool isOutOfEdge (const gp_Pnt& p); bool isOutOfVertex(const gp_Pnt& p); - bool isOutOfNone (const gp_Pnt& p) { return true; } + bool isOutOfNone (const gp_Pnt& /*p*/) { return true; } bool isBox (const TopoDS_Shape& s); TopoDS_Shape prepareSolid( const TopoDS_Shape& theSolid ); diff --git a/src/Controls/SMESH_ControlsDef.hxx b/src/Controls/SMESH_ControlsDef.hxx index bce0abab9..7d25f1dca 100644 --- a/src/Controls/SMESH_ControlsDef.hxx +++ b/src/Controls/SMESH_ControlsDef.hxx @@ -129,7 +129,7 @@ namespace SMESH{ NumericalFunctor(); virtual void SetMesh( const SMDS_Mesh* theMesh ); virtual double GetValue( long theElementId ); - virtual double GetValue(const TSequenceOfXYZ& thePoints) { return -1.0;}; + virtual double GetValue(const TSequenceOfXYZ& /*thePoints*/) { return -1.0;}; void GetHistogram(int nbIntervals, std::vector& nbEvents, std::vector& funValues, @@ -1214,8 +1214,8 @@ namespace SMESH{ protected: PredicatePtr myPredicate; }; - }; -}; + } +} #endif diff --git a/src/Driver/Driver_Mesh.cxx b/src/Driver/Driver_Mesh.cxx index edf91376e..30000d5df 100644 --- a/src/Driver/Driver_Mesh.cxx +++ b/src/Driver/Driver_Mesh.cxx @@ -123,15 +123,15 @@ std::string Driver_Mesh::fixUTF8(const std::string & str ) // how many bytes follow? int len = 0; - if (s[i] >> 5 == 0b110 ) len = 1; - else if (s[i] >> 4 == 0b1110 ) len = 2; - else if (s[i] >> 3 == 0b11110) len = 3; + if (s[i] >> 5 == 0b110 ) len = 1; // todo: binary constants are a GCC extension + else if (s[i] >> 4 == 0b1110 ) len = 2; // todo: binary constants are a GCC extension + else if (s[i] >> 3 == 0b11110) len = 3; // todo: binary constants are a GCC extension else invalid = true; // check the bytes for ( int j = 0; j < len && !invalid; ++j ) - invalid = ( s[i+j+1] >> 6 != 0b10 ); + invalid = ( s[i+j+1] >> 6 != 0b10 ); // todo: binary constants are a GCC extension if ( invalid ) fixed[i] = '?'; diff --git a/src/Driver/Driver_Mesh.h b/src/Driver/Driver_Mesh.h index 1b0b3644e..bd6a71406 100644 --- a/src/Driver/Driver_Mesh.h +++ b/src/Driver/Driver_Mesh.h @@ -63,8 +63,8 @@ class MESHDRIVER_EXPORT Driver_Mesh virtual void SetMeshName(const std::string& theMeshName); virtual std::string GetMeshName() const; - virtual void SetOption(const std::string& optionName, - const std::string& optionValue) {} + virtual void SetOption(const std::string& /*optionName*/, + const std::string& /*optionValue*/) {} virtual Status Perform() = 0; diff --git a/src/DriverCGNS/DriverCGNS_Read.cxx b/src/DriverCGNS/DriverCGNS_Read.cxx index fc1ba5120..08dd9524c 100644 --- a/src/DriverCGNS/DriverCGNS_Read.cxx +++ b/src/DriverCGNS/DriverCGNS_Read.cxx @@ -134,12 +134,12 @@ namespace ids[2] = ids[0] + _sizeX + 1; ids[3] = ids[0] + ( k==_sizeZ ? _sizeX : 1); } - void IEdgeNodes( int i, int j, int k, cgsize_t* ids ) const // edge perpendiculaire to X (2D) + void IEdgeNodes( int i, int j, int /*k*/, cgsize_t* ids ) const // edge perpendiculaire to X (2D) { ids[0] = NodeID( i, j, 0 ); ids[1] = ids[0] + _sizeX; } - void JEdgeNodes( int i, int j, int k, cgsize_t* ids ) const + void JEdgeNodes( int i, int j, int /*k*/, cgsize_t* ids ) const { ids[0] = NodeID( i, j, 0 ); ids[1] = ids[0] + 1; @@ -187,7 +187,7 @@ namespace } gp_XYZ Next() { - gp_XYZ res( _cur[0], _cur[1], _cur[2] ); + gp_XYZ res( _cur[0], _cur[1], _cur[2] ); // todo: _cur can be used uninitialized for ( int i = 0; i < _dim; ++i ) { _cur[i] += _dir[i]; @@ -207,7 +207,7 @@ namespace size *= _dir[i]*(_end[i]-_beg[i]); return size; } - gp_XYZ Begin() const { return gp_XYZ( _beg[0], _beg[1], _beg[2] ); } + gp_XYZ Begin() const { return gp_XYZ( _beg[0], _beg[1], _beg[2] ); } // todo: _beg can be used uninitialized //gp_XYZ End() const { return gp_XYZ( _end[0]-1, _end[1]-1, _end[2]-1 ); } }; @@ -297,7 +297,7 @@ namespace } // fill nodeReplacementMap - TPointRangeIterator rangeIt1( range, _meshDim ); + TPointRangeIterator rangeIt1( range, _meshDim ); // todo: rangeIt1: _end[i], _dir[i], _beg[i], _cur[i] may be used uninitialized TPointRangeIterator rangeIt2( donorRange, _meshDim ); gp_XYZ begin1 = rangeIt1.Begin(), begin2 = rangeIt2.Begin(), index1, index2; if ( &zone2 == this ) diff --git a/src/DriverGMF/libmesh5.c b/src/DriverGMF/libmesh5.c index 2c889ccc2..e1fe65fb6 100644 --- a/src/DriverGMF/libmesh5.c +++ b/src/DriverGMF/libmesh5.c @@ -78,7 +78,7 @@ typedef struct static int GmfIniFlg=0; static GmfMshSct *GmfMshTab[ MaxMsh + 1 ]; -// see MeshGems/Docs/meshgems_formats_description.pdf +/* see MeshGems/Docs/meshgems_formats_description.pdf */ static const char *GmfKwdFmt[ GmfMaxKwd + 1 ][4] = { {"Reserved", "", "", ""}, {"MeshVersionFormatted", "", "", "i"}, @@ -875,7 +875,7 @@ void GmfSetLin(int MshIdx, int KwdCod, ...) { for(i=0;iSolSiz;i++) if(kwd->fmt[i] == 'r') - fprintf(msh->hdl, "%.15lg ", va_arg(VarArg, double)); + fprintf(msh->hdl, "%.15lg ", va_arg(VarArg, double)); /* todo: ISO C90 does not support the '%lg' gnu_printf format */ else if(kwd->fmt[i] == 'n') { nb_repeat = va_arg(VarArg, int); fprintf(msh->hdl, "%d ", nb_repeat); @@ -936,7 +936,7 @@ void GmfSetLin(int MshIdx, int KwdCod, ...) if(msh->typ & Asc) for(j=0;jSolSiz;j++) - fprintf(msh->hdl, "%.15lg ", DblSolTab[j]); + fprintf(msh->hdl, "%.15lg ", DblSolTab[j]); /* todo: ISO C90 does not support the '%lg' gnu_printf format */ else RecBlk(msh, (unsigned char *)DblSolTab, kwd->NmbWrd); } @@ -1064,7 +1064,7 @@ static int ScaKwdTab(GmfMshSct *msh) { /* Search which kwd code this string is associated with, then get its header and save the current position in file (just before the data) */ - // printf("libmesh ScaKwdTab %s\n", str); + /* printf("libmesh ScaKwdTab %s\n", str); */ for(KwdCod=1; KwdCod<= GmfMaxKwd; KwdCod++) if(!strcmp(str, GmfKwdFmt[ KwdCod ][0])) { @@ -1191,7 +1191,7 @@ static void ExpFmt(GmfMshSct *msh, int KwdCod) i = kwd->SolSiz = kwd->NmbWrd = 0; - while(i < strlen(InpFmt)) + while(i < (int)strlen(InpFmt)) { chr = InpFmt[ i++ ]; diff --git a/src/DriverGMF/libmesh5.h b/src/DriverGMF/libmesh5.h index 6345d1df3..55a9c6d66 100644 --- a/src/DriverGMF/libmesh5.h +++ b/src/DriverGMF/libmesh5.h @@ -18,7 +18,15 @@ /* Defines */ /*----------------------------------------------------------*/ -#include "SMESH_DriverGMF.hxx" +#ifdef WIN32 + #if defined MESHDriverGMF_EXPORTS || defined MeshDriverGMF_EXPORTS + #define MESHDriverGMF_EXPORT __declspec( dllexport ) + #else + #define MESHDriverGMF_EXPORT __declspec( dllimport ) + #endif +#else + #define MESHDriverGMF_EXPORT +#endif #define GmfStrSiz 1024 #define GmfMaxTyp 1000 @@ -33,7 +41,7 @@ #define GmfFloat 1 #define GmfDouble 2 -// see MeshGems/Docs/meshgems_formats_description.pdf +/* see MeshGems/Docs/meshgems_formats_description.pdf */ enum GmfKwdCod { GmfReserved1, \ diff --git a/src/DriverMED/DriverMED_W_Field.cxx b/src/DriverMED/DriverMED_W_Field.cxx index f48223321..197cd1cb8 100644 --- a/src/DriverMED/DriverMED_W_Field.cxx +++ b/src/DriverMED/DriverMED_W_Field.cxx @@ -156,7 +156,7 @@ bool DriverMED_W_Field::Set(SMESHDS_Mesh * mesh, else _dblValues.reserve( nbElems * nbComps ); - return nbElems * nbComps; + return nbElems && nbComps; } //================================================================================ diff --git a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx index c7d22645d..052869ab8 100644 --- a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx +++ b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx @@ -112,7 +112,7 @@ void DriverMED_W_SMESHDS_Mesh::AddAllSubMeshes() myAllSubMeshes = true; } -void DriverMED_W_SMESHDS_Mesh::AddSubMesh(SMESHDS_SubMesh* theSubMesh, int theID) +void DriverMED_W_SMESHDS_Mesh::AddSubMesh(SMESHDS_SubMesh* theSubMesh, int /*theID*/) { mySubMeshes.push_back( theSubMesh ); } @@ -379,7 +379,7 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform() if ( myAutoDimension && aMeshDimension < 3 ) { SMDS_NodeIteratorPtr aNodesIter = myMesh->nodesIterator(); - double aBounds[6]; + double aBounds[6] = {0.,0.,0.,0.,0.,0.}; if(aNodesIter->more()){ const SMDS_MeshNode* aNode = aNodesIter->next(); aBounds[0] = aBounds[1] = aNode->X(); diff --git a/src/DriverUNV/UNV164_Structure.hxx b/src/DriverUNV/UNV164_Structure.hxx index d063fcd32..d2d4f9f20 100644 --- a/src/DriverUNV/UNV164_Structure.hxx +++ b/src/DriverUNV/UNV164_Structure.hxx @@ -88,7 +88,7 @@ namespace UNV164 MESHDRIVERUNV_EXPORT void Write(std::ofstream& out_stream ); -}; +} #endif diff --git a/src/DriverUNV/UNV2411_Structure.hxx b/src/DriverUNV/UNV2411_Structure.hxx index ff5ac403a..f876d3741 100644 --- a/src/DriverUNV/UNV2411_Structure.hxx +++ b/src/DriverUNV/UNV2411_Structure.hxx @@ -49,7 +49,7 @@ namespace UNV2411{ MESHDRIVERUNV_EXPORT void Write(std::ofstream& out_stream, const TDataSet& theDataSet); -}; +} #endif diff --git a/src/DriverUNV/UNV2412_Structure.hxx b/src/DriverUNV/UNV2412_Structure.hxx index ccf6829c3..9c5328d2b 100644 --- a/src/DriverUNV/UNV2412_Structure.hxx +++ b/src/DriverUNV/UNV2412_Structure.hxx @@ -65,7 +65,7 @@ namespace UNV2412{ MESHDRIVERUNV_EXPORT bool IsVolume(int theFeDescriptorId); -}; +} #endif diff --git a/src/DriverUNV/UNV2417_Structure.hxx b/src/DriverUNV/UNV2417_Structure.hxx index 4f17ded3d..9202ba349 100644 --- a/src/DriverUNV/UNV2417_Structure.hxx +++ b/src/DriverUNV/UNV2417_Structure.hxx @@ -46,7 +46,7 @@ namespace UNV2417{ void ReadGroup(const std::string& myGroupLabel, std::ifstream& in_stream, TDataSet& theDataSet); void Write(std::ofstream& out_stream, const TDataSet& theDataSet); -}; +} #endif diff --git a/src/DriverUNV/UNV2420_Structure.hxx b/src/DriverUNV/UNV2420_Structure.hxx index 14f82b9a3..dfabe1d9b 100644 --- a/src/DriverUNV/UNV2420_Structure.hxx +++ b/src/DriverUNV/UNV2420_Structure.hxx @@ -113,7 +113,7 @@ namespace UNV2420 const std::string& part_name); // can store a mesh name // const TDataSet& theDataSet); -}; +} #endif diff --git a/src/DriverUNV/UNV_Utilities.hxx b/src/DriverUNV/UNV_Utilities.hxx index 4e5a08408..6792d4f1d 100644 --- a/src/DriverUNV/UNV_Utilities.hxx +++ b/src/DriverUNV/UNV_Utilities.hxx @@ -141,7 +141,7 @@ namespace UNV { resLine.resize( resLine.size()-1 ); return resLine; } -}; +} #ifndef MESSAGE diff --git a/src/MEDWrapper/MED_Algorithm.cxx b/src/MEDWrapper/MED_Algorithm.cxx index a62f979ea..c36c53096 100644 --- a/src/MEDWrapper/MED_Algorithm.cxx +++ b/src/MEDWrapper/MED_Algorithm.cxx @@ -28,8 +28,8 @@ static int MYDEBUG = 0; static int MYVALUEDEBUG = 0; #else -static int MYDEBUG = 0; -static int MYVALUEDEBUG = 0; +static int MYDEBUG = 0; // todo: unused in release mode +static int MYVALUEDEBUG = 0; // todo: unused in release mode #endif namespace MED @@ -178,7 +178,7 @@ namespace MED //--------------------------------------------------------------- TEntity2FamilySet - GetEntity2FamilySet(const PWrapper& theWrapper, + GetEntity2FamilySet(const PWrapper& /*theWrapper*/, const TEntity2TGeom2ElemInfo& theEntity2TGeom2ElemInfo, const TFamilyInfoSet& theFamilyInfoSet) { diff --git a/src/MEDWrapper/MED_Common.cxx b/src/MEDWrapper/MED_Common.cxx index b394d01ed..f67ed68b2 100644 --- a/src/MEDWrapper/MED_Common.cxx +++ b/src/MEDWrapper/MED_Common.cxx @@ -65,8 +65,8 @@ namespace MED TInt GetNbConn(EGeometrieElement typmai, - EEntiteMaillage typent, - TInt mdim) + EEntiteMaillage /*typent*/, + TInt /*mdim*/) { return typmai % 100; } diff --git a/src/MEDWrapper/MED_CoordUtils.cxx b/src/MEDWrapper/MED_CoordUtils.cxx index 22b4dc674..a9dc07716 100644 --- a/src/MEDWrapper/MED_CoordUtils.cxx +++ b/src/MEDWrapper/MED_CoordUtils.cxx @@ -36,7 +36,7 @@ namespace MED template<> TFloat - GetCoord(const TCCoordSlice& theCoordSlice) + GetCoord(const TCCoordSlice& /*theCoordSlice*/) { return 0.0; } diff --git a/src/MEDWrapper/MED_GaussUtils.cxx b/src/MEDWrapper/MED_GaussUtils.cxx index 2dfdef1af..314b7c558 100644 --- a/src/MEDWrapper/MED_GaussUtils.cxx +++ b/src/MEDWrapper/MED_GaussUtils.cxx @@ -27,8 +27,8 @@ static int MYDEBUG = 0; static int MYVALUEDEBUG = 0; #else -static int MYDEBUG = 0; -static int MYVALUEDEBUG = 0; +static int MYDEBUG = 0; // todo: unused in release mode +static int MYVALUEDEBUG = 0; // todo: unused in release mode #endif namespace MED diff --git a/src/MEDWrapper/MED_Structures.cxx b/src/MEDWrapper/MED_Structures.cxx index a0e91f4a3..aa7777c10 100644 --- a/src/MEDWrapper/MED_Structures.cxx +++ b/src/MEDWrapper/MED_Structures.cxx @@ -352,10 +352,10 @@ namespace MED TGaussInfo::TLess ::operator()(const TGaussInfo& theLeft, const TGaussInfo& theRight) const { - if(!&theLeft) + if(!&theLeft) // todo: address of reference can be assumed always non-null by compiler return true; - if(!&theRight) + if(!&theRight) // todo: address of reference can be assumed always non-null by compiler return false; if(theLeft.myGeom != theRight.myGeom) @@ -644,13 +644,14 @@ namespace MED switch(aDim){ case 3: aCoord[2] = myCoord[aDim*theId+2]; + // fall through case 2: aCoord[1] = myCoord[aDim*theId+1]; - case 1:{ + // fall through + case 1: aCoord[0] = myCoord[aDim*theId]; break; } - } } else { TFloatVector aVecX = this->GetIndexes(0); diff --git a/src/MEDWrapper/MED_TStructures.hxx b/src/MEDWrapper/MED_TStructures.hxx index c6a22573a..c2375c546 100644 --- a/src/MEDWrapper/MED_TStructures.hxx +++ b/src/MEDWrapper/MED_TStructures.hxx @@ -930,7 +930,7 @@ namespace MED const TGeom2Size& theGeom2Size, const TGeom2NbGauss& theGeom2NbGauss, TInt theNumDt, - TInt theNumOrd, + TInt /*theNumOrd*/, TFloat theDt, const std::string& theUnitDt, const TGeom2Gauss& theGeom2Gauss) diff --git a/src/MEDWrapper/MED_Utilities.cxx b/src/MEDWrapper/MED_Utilities.cxx index 97c48e3ee..2c7cf7c4d 100644 --- a/src/MEDWrapper/MED_Utilities.cxx +++ b/src/MEDWrapper/MED_Utilities.cxx @@ -26,7 +26,7 @@ #ifdef _DEBUG_ static int MYDEBUG = 0; #else -static int MYDEBUG = 0; +static int MYDEBUG = 0; // todo: unused in release mode #endif int MED::PrefixPrinter::myCounter = 0; @@ -39,7 +39,7 @@ MED::PrefixPrinter::PrefixPrinter(bool theIsActive): MSG(MYDEBUG,"MED::PrefixPrinter::PrefixPrinter(...)- "<GetMTime(); vtkMTimeType anObjTime = myVisualObj->GetUnstructuredGrid()->GetMTime(); diff --git a/src/OBJECT/SMESH_Actor.h b/src/OBJECT/SMESH_Actor.h index 9099580c9..9ef509d59 100644 --- a/src/OBJECT/SMESH_Actor.h +++ b/src/OBJECT/SMESH_Actor.h @@ -56,7 +56,7 @@ class SMESHOBJECT_EXPORT SMESH_Actor: public SALOME_Actor static SMESH_Actor* New() { return NULL;} public: - vtkTypeMacro(SMESH_Actor,SALOME_Actor); + vtkTypeMacro(SMESH_Actor,SALOME_Actor) static SMESH_Actor* New(TVisualObjPtr theVisualObj, const char* theEntry, const char* theName, diff --git a/src/OBJECT/SMESH_ActorDef.h b/src/OBJECT/SMESH_ActorDef.h index 8a276768d..36ef136fa 100644 --- a/src/OBJECT/SMESH_ActorDef.h +++ b/src/OBJECT/SMESH_ActorDef.h @@ -83,7 +83,7 @@ class SMESH_ActorDef : public SMESH_Actor friend class SMESH_Actor; public: - vtkTypeMacro(SMESH_ActorDef,SMESH_Actor); + vtkTypeMacro(SMESH_ActorDef,SMESH_Actor) virtual void Delete(); diff --git a/src/OBJECT/SMESH_CellLabelActor.cxx b/src/OBJECT/SMESH_CellLabelActor.cxx index bb0f39ade..07275df16 100644 --- a/src/OBJECT/SMESH_CellLabelActor.cxx +++ b/src/OBJECT/SMESH_CellLabelActor.cxx @@ -44,7 +44,7 @@ #include #include -vtkStandardNewMacro(SMESH_CellLabelActor); +vtkStandardNewMacro(SMESH_CellLabelActor) /*! Constructor. @@ -205,7 +205,7 @@ void SMESH_CellLabelActor::UpdateLabels() void SMESH_CellLabelActor::ProcessEvents(vtkObject* vtkNotUsed(theObject), - unsigned long theEvent, + unsigned long /*theEvent*/, void* theClientData, void* vtkNotUsed(theCallData)) { diff --git a/src/OBJECT/SMESH_CellLabelActor.h b/src/OBJECT/SMESH_CellLabelActor.h index 58d7feb39..38596c9d8 100644 --- a/src/OBJECT/SMESH_CellLabelActor.h +++ b/src/OBJECT/SMESH_CellLabelActor.h @@ -49,7 +49,7 @@ public: void* theCallData); - vtkTypeMacro(SMESH_CellLabelActor, SMESH_DeviceActor); + vtkTypeMacro(SMESH_CellLabelActor, SMESH_DeviceActor) virtual void SetCellsLabeled(bool theIsCellsLabeled); diff --git a/src/OBJECT/SMESH_DeviceActor.cxx b/src/OBJECT/SMESH_DeviceActor.cxx index 0cd05d201..882326963 100644 --- a/src/OBJECT/SMESH_DeviceActor.cxx +++ b/src/OBJECT/SMESH_DeviceActor.cxx @@ -77,7 +77,7 @@ static int MYDEBUG = 0; using namespace std; -vtkStandardNewMacro(SMESH_DeviceActor); +vtkStandardNewMacro(SMESH_DeviceActor) SMESH_DeviceActor @@ -410,7 +410,7 @@ SMESH_DeviceActor aNbCells = 0; for(; anIter != aValues.end(); anIter++){ const Length2D::Value& aValue = *anIter; - int aNode[2] = { + vtkIdType aNode[2] = { myVisualObj->GetNodeVTKId(aValue.myPntId[0]), myVisualObj->GetNodeVTKId(aValue.myPntId[1]) }; @@ -475,7 +475,7 @@ SMESH_DeviceActor aNbCells = 0; for(; anIter != aValues.end(); anIter++){ const MultiConnection2D::Value& aValue = (*anIter).first; - int aNode[2] = { + vtkIdType aNode[2] = { myVisualObj->GetNodeVTKId(aValue.myPntId[0]), myVisualObj->GetNodeVTKId(aValue.myPntId[1]) }; @@ -573,7 +573,7 @@ SMESH_DeviceActor FreeEdges::TBorders::const_iterator anIter = aBorders.begin(); for(; anIter != aBorders.end(); anIter++){ const FreeEdges::Border& aBorder = *anIter; - int aNode[2] = { + vtkIdType aNode[2] = { myVisualObj->GetNodeVTKId(aBorder.myPntId[0]), myVisualObj->GetNodeVTKId(aBorder.myPntId[1]) }; diff --git a/src/OBJECT/SMESH_DeviceActor.h b/src/OBJECT/SMESH_DeviceActor.h index 25ebf4d39..70c39ba71 100644 --- a/src/OBJECT/SMESH_DeviceActor.h +++ b/src/OBJECT/SMESH_DeviceActor.h @@ -61,7 +61,7 @@ class SMESHOBJECT_EXPORT SMESH_DeviceActor: public vtkLODActor{ friend class SMESH_ActorDef; public: - vtkTypeMacro(SMESH_DeviceActor,vtkLODActor); + vtkTypeMacro(SMESH_DeviceActor,vtkLODActor) static SMESH_DeviceActor* New(); void SetStoreClippingMapping(bool theStoreMapping); diff --git a/src/OBJECT/SMESH_ExtractGeometry.cxx b/src/OBJECT/SMESH_ExtractGeometry.cxx index 9bbe415c0..4a4ab1716 100644 --- a/src/OBJECT/SMESH_ExtractGeometry.cxx +++ b/src/OBJECT/SMESH_ExtractGeometry.cxx @@ -48,7 +48,7 @@ using namespace std; #endif -vtkStandardNewMacro(SMESH_ExtractGeometry); +vtkStandardNewMacro(SMESH_ExtractGeometry) SMESH_ExtractGeometry::SMESH_ExtractGeometry() diff --git a/src/OBJECT/SMESH_ExtractGeometry.h b/src/OBJECT/SMESH_ExtractGeometry.h index 0bf9c8c3c..f417c49b2 100644 --- a/src/OBJECT/SMESH_ExtractGeometry.h +++ b/src/OBJECT/SMESH_ExtractGeometry.h @@ -32,7 +32,7 @@ class SMESHOBJECT_EXPORT SMESH_ExtractGeometry : public vtkExtractGeometry{ public: - vtkTypeMacro(SMESH_ExtractGeometry,vtkExtractGeometry); + vtkTypeMacro(SMESH_ExtractGeometry,vtkExtractGeometry) static SMESH_ExtractGeometry *New(); diff --git a/src/OBJECT/SMESH_FaceOrientationFilter.cxx b/src/OBJECT/SMESH_FaceOrientationFilter.cxx index cab147064..93b1e353e 100644 --- a/src/OBJECT/SMESH_FaceOrientationFilter.cxx +++ b/src/OBJECT/SMESH_FaceOrientationFilter.cxx @@ -42,7 +42,7 @@ #define PI 3.14159265359 -vtkStandardNewMacro(SMESH_FaceOrientationFilter); +vtkStandardNewMacro(SMESH_FaceOrientationFilter) /*! * \class SMESH_FaceOrientationFilter @@ -237,7 +237,7 @@ void GetFaceParams( vtkCell* theFace, double theNormal[3], double& theSize ) * Execute method. Output calculation. */ int SMESH_FaceOrientationFilter::RequestData( - vtkInformation *request, + vtkInformation * /*request*/, vtkInformationVector **inputVector, vtkInformationVector *outputVector) { diff --git a/src/OBJECT/SMESH_FaceOrientationFilter.h b/src/OBJECT/SMESH_FaceOrientationFilter.h index 187510c5d..73bf7a2f6 100644 --- a/src/OBJECT/SMESH_FaceOrientationFilter.h +++ b/src/OBJECT/SMESH_FaceOrientationFilter.h @@ -33,7 +33,7 @@ class VTKViewer_CellCenters; class SMESHOBJECT_EXPORT SMESH_FaceOrientationFilter : public vtkPolyDataAlgorithm { public: - vtkTypeMacro( SMESH_FaceOrientationFilter, vtkPolyDataAlgorithm ); + vtkTypeMacro( SMESH_FaceOrientationFilter, vtkPolyDataAlgorithm ) /*!Create a new SMESH_FaceOrientationFilter.*/ static SMESH_FaceOrientationFilter *New(); diff --git a/src/OBJECT/SMESH_NodeLabelActor.cxx b/src/OBJECT/SMESH_NodeLabelActor.cxx index ef1ee520f..4d4afbf41 100644 --- a/src/OBJECT/SMESH_NodeLabelActor.cxx +++ b/src/OBJECT/SMESH_NodeLabelActor.cxx @@ -39,7 +39,7 @@ #include #include -vtkStandardNewMacro(SMESH_NodeLabelActor); +vtkStandardNewMacro(SMESH_NodeLabelActor) /*! Constructor. @@ -195,7 +195,7 @@ void SMESH_NodeLabelActor::UpdateLabels() void SMESH_NodeLabelActor::ProcessEvents(vtkObject* vtkNotUsed(theObject), - unsigned long theEvent, + unsigned long /*theEvent*/, void* theClientData, void* vtkNotUsed(theCallData)) { diff --git a/src/OBJECT/SMESH_NodeLabelActor.h b/src/OBJECT/SMESH_NodeLabelActor.h index 1c88b29e9..3158e7418 100644 --- a/src/OBJECT/SMESH_NodeLabelActor.h +++ b/src/OBJECT/SMESH_NodeLabelActor.h @@ -46,7 +46,7 @@ public: void* theCallData); - vtkTypeMacro(SMESH_NodeLabelActor, SMESH_DeviceActor); + vtkTypeMacro(SMESH_NodeLabelActor, SMESH_DeviceActor) virtual void SetPointsLabeled(bool theIsPointsLabeled); diff --git a/src/OBJECT/SMESH_SVTKActor.cxx b/src/OBJECT/SMESH_SVTKActor.cxx index 2467e9710..103a46f1e 100644 --- a/src/OBJECT/SMESH_SVTKActor.cxx +++ b/src/OBJECT/SMESH_SVTKActor.cxx @@ -43,7 +43,7 @@ #include -vtkStandardNewMacro(SMESH_SVTKActor); +vtkStandardNewMacro(SMESH_SVTKActor) /*! Constructor diff --git a/src/OBJECT/SMESH_SVTKActor.h b/src/OBJECT/SMESH_SVTKActor.h index 820dd60c2..77499fde5 100644 --- a/src/OBJECT/SMESH_SVTKActor.h +++ b/src/OBJECT/SMESH_SVTKActor.h @@ -41,7 +41,7 @@ class SMESHOBJECT_EXPORT SMESH_SVTKActor : public SVTK_Actor { public: static SMESH_SVTKActor* New(); - vtkTypeMacro(SMESH_SVTKActor, SVTK_Actor); + vtkTypeMacro(SMESH_SVTKActor, SVTK_Actor) void SetBallScale(double theSize); void SetBallSize(float theSize); diff --git a/src/OBJECT/SMESH_ScalarBarActor.cxx b/src/OBJECT/SMESH_ScalarBarActor.cxx index f1990d55f..6ea4849a6 100644 --- a/src/OBJECT/SMESH_ScalarBarActor.cxx +++ b/src/OBJECT/SMESH_ScalarBarActor.cxx @@ -41,11 +41,11 @@ #define SHRINK_COEF 0.08; -vtkStandardNewMacro(SMESH_ScalarBarActor); +vtkStandardNewMacro(SMESH_ScalarBarActor) -vtkCxxSetObjectMacro(SMESH_ScalarBarActor,LookupTable,vtkScalarsToColors); -vtkCxxSetObjectMacro(SMESH_ScalarBarActor,LabelTextProperty,vtkTextProperty); -vtkCxxSetObjectMacro(SMESH_ScalarBarActor,TitleTextProperty,vtkTextProperty); +vtkCxxSetObjectMacro(SMESH_ScalarBarActor,LookupTable,vtkScalarsToColors) +vtkCxxSetObjectMacro(SMESH_ScalarBarActor,LabelTextProperty,vtkTextProperty) +vtkCxxSetObjectMacro(SMESH_ScalarBarActor,TitleTextProperty,vtkTextProperty) //---------------------------------------------------------------------------- // Instantiate object with 64 maximum colors; 5 labels; %%-#6.3g label diff --git a/src/OBJECT/SMESH_ScalarBarActor.h b/src/OBJECT/SMESH_ScalarBarActor.h index 214903fde..fe3580010 100644 --- a/src/OBJECT/SMESH_ScalarBarActor.h +++ b/src/OBJECT/SMESH_ScalarBarActor.h @@ -91,7 +91,7 @@ class SMESHOBJECT_EXPORT SMESH_ScalarBarActor: public vtkActor2D { public: void PrintSelf(ostream& os, vtkIndent indent); - vtkTypeMacro(SMESH_ScalarBarActor,vtkActor2D); + vtkTypeMacro(SMESH_ScalarBarActor,vtkActor2D) // Description: // Instantiate object with 64 maximum colors; 5 labels; %%-#6.3g label diff --git a/src/PluginUtils/GeomSelectionTools.h b/src/PluginUtils/GeomSelectionTools.h index 6228f3492..3df7d90fe 100644 --- a/src/PluginUtils/GeomSelectionTools.h +++ b/src/PluginUtils/GeomSelectionTools.h @@ -72,7 +72,7 @@ public: namespace PluginUtils { PLUGINUTILS_EXPORT QString PrintDoubleValue( double, int = 16 ); -}; +} #endif // _GEOMSELECTIONTOOLS_H_ diff --git a/src/SMDS/SMDS_Downward.cxx b/src/SMDS/SMDS_Downward.cxx index c62667a9d..a788a9e51 100644 --- a/src/SMDS/SMDS_Downward.cxx +++ b/src/SMDS/SMDS_Downward.cxx @@ -122,7 +122,7 @@ int SMDS_Downward::addCell(int vtkId) * * @param cellId */ -void SMDS_Downward::initCell(int cellId) +void SMDS_Downward::initCell(int /*cellId*/) { } @@ -131,7 +131,7 @@ void SMDS_Downward::initCell(int cellId) * @param cellId not used here. * @return */ -int SMDS_Downward::getNumberOfDownCells(int cellId) +int SMDS_Downward::getNumberOfDownCells(int /*cellId*/) { return _nbDownCells; } @@ -154,7 +154,7 @@ const int* SMDS_Downward::getDownCells(int cellId) * @param cellId index of the cell in the downward structure relative to a vtk cell type. * @return table of downward entities types. */ -const unsigned char* SMDS_Downward::getDownTypes(int cellId) +const unsigned char* SMDS_Downward::getDownTypes(int /*cellId*/) { return &_cellTypes[0]; } @@ -165,7 +165,7 @@ const unsigned char* SMDS_Downward::getDownTypes(int cellId) * @param lowCellId index of the children cell to add (dimension n-1) * @param aType vtk cell type of the cell to add (needed to find the SMDS_Downward structure containing the cell to add). */ -void SMDS_Downward::addDownCell(int cellId, int lowCellId, unsigned char aType) +void SMDS_Downward::addDownCell(int /*cellId*/, int /*lowCellId*/, unsigned char /*aType*/) { ASSERT(0); // must be re-implemented in derived class } @@ -176,12 +176,12 @@ void SMDS_Downward::addDownCell(int cellId, int lowCellId, unsigned char aType) * @param upCellId index of the parent cell to add (dimension n+1) * @param aType vtk cell type of the cell to add (needed to find the SMDS_Downward structure containing the cell to add). */ -void SMDS_Downward::addUpCell(int cellId, int upCellId, unsigned char aType) +void SMDS_Downward::addUpCell(int /*cellId*/, int /*upCellId*/, unsigned char /*aType*/) { ASSERT(0); // must be re-implemented in derived class } -int SMDS_Downward::getNodeSet(int cellId, int* nodeSet) +int SMDS_Downward::getNodeSet(int /*cellId*/, int* /*nodeSet*/) { return 0; } @@ -777,17 +777,17 @@ void SMDS_Down3D::compactStorage() // nothing to do, size was known before } -int SMDS_Down3D::getNumberOfUpCells(int cellId) +int SMDS_Down3D::getNumberOfUpCells(int /*cellId*/) { return 0; } -const int* SMDS_Down3D::getUpCells(int cellId) +const int* SMDS_Down3D::getUpCells(int /*cellId*/) { return 0; } -const unsigned char* SMDS_Down3D::getUpTypes(int cellId) +const unsigned char* SMDS_Down3D::getUpTypes(int /*cellId*/) { return 0; } @@ -904,7 +904,7 @@ void SMDS_DownTriangle::computeEdgesWithNodes(int cellId, ListElemByNodesType& e edgesWithNodes.elems[2].vtkType = VTK_LINE; } -void SMDS_DownTriangle::addDownCell(int cellId, int lowCellId, unsigned char aType) +void SMDS_DownTriangle::addDownCell(int cellId, int lowCellId, unsigned char /*aType*/) { //ASSERT((cellId >=0)&& (cellId < _maxId)); //ASSERT(aType == VTK_LINE); @@ -961,7 +961,7 @@ void SMDS_DownQuadTriangle::computeEdgesWithNodes(int cellId, ListElemByNodesTyp edgesWithNodes.elems[2].vtkType = VTK_QUADRATIC_EDGE; } -void SMDS_DownQuadTriangle::addDownCell(int cellId, int lowCellId, unsigned char aType) +void SMDS_DownQuadTriangle::addDownCell(int cellId, int lowCellId, unsigned char /*aType*/) { //ASSERT((cellId >=0)&& (cellId < _maxId)); //ASSERT(aType == VTK_QUADRATIC_EDGE); @@ -1021,7 +1021,7 @@ void SMDS_DownQuadrangle::computeEdgesWithNodes(int cellId, ListElemByNodesType& edgesWithNodes.elems[3].vtkType = VTK_LINE; } -void SMDS_DownQuadrangle::addDownCell(int cellId, int lowCellId, unsigned char aType) +void SMDS_DownQuadrangle::addDownCell(int cellId, int lowCellId, unsigned char /*aType*/) { //ASSERT((cellId >=0)&& (cellId < _maxId)); //ASSERT(aType == VTK_LINE); @@ -1085,7 +1085,7 @@ void SMDS_DownQuadQuadrangle::computeEdgesWithNodes(int cellId, ListElemByNodesT edgesWithNodes.elems[3].vtkType = VTK_QUADRATIC_EDGE; } -void SMDS_DownQuadQuadrangle::addDownCell(int cellId, int lowCellId, unsigned char aType) +void SMDS_DownQuadQuadrangle::addDownCell(int cellId, int lowCellId, unsigned char /*aType*/) { //ASSERT((cellId >=0)&& (cellId < _maxId)); //ASSERT(aType == VTK_QUADRATIC_EDGE); @@ -1150,7 +1150,7 @@ void SMDS_DownTetra::getOrderedNodesOfFace(int cellId, std::vector& o MESSAGE(nodes[0] << " " << nodes[1] << " " << nodes[2] << " " << nodes[3]); } -void SMDS_DownTetra::addDownCell(int cellId, int lowCellId, unsigned char aType) +void SMDS_DownTetra::addDownCell(int cellId, int lowCellId, unsigned char /*aType*/) { //ASSERT((cellId >=0)&& (cellId < _maxId)); //ASSERT(aType == VTK_TRIANGLE); @@ -1258,7 +1258,7 @@ void SMDS_DownQuadTetra::getOrderedNodesOfFace(int cellId, std::vector=0)&& (cellId < _maxId)); //ASSERT(aType == VTK_QUADRATIC_TRIANGLE); @@ -2006,7 +2006,7 @@ void SMDS_DownHexa::getOrderedNodesOfFace(int cellId, std::vector& or MESSAGE(nodes[4] << " " << nodes[5] << " " << nodes[6] << " " << nodes[7]); } -void SMDS_DownHexa::addDownCell(int cellId, int lowCellId, unsigned char aType) +void SMDS_DownHexa::addDownCell(int cellId, int lowCellId, unsigned char /*aType*/) { //ASSERT((cellId >=0)&& (cellId < _maxId)); int *faces = &_cellIds[_nbDownCells * cellId]; @@ -2137,7 +2137,7 @@ void SMDS_DownQuadHexa::getOrderedNodesOfFace(int cellId, std::vector MESSAGE(nodes[0] << " " << nodes[1] << " " << nodes[2] << " " << nodes[3]); } -void SMDS_DownQuadHexa::addDownCell(int cellId, int lowCellId, unsigned char aType) +void SMDS_DownQuadHexa::addDownCell(int cellId, int lowCellId, unsigned char /*aType*/) { //ASSERT((cellId >=0)&& (cellId < _maxId)); int *faces = &_cellIds[_nbDownCells * cellId]; diff --git a/src/SMDS/SMDS_Downward.hxx b/src/SMDS/SMDS_Downward.hxx index 0bc57ff31..0bc6730cd 100644 --- a/src/SMDS/SMDS_Downward.hxx +++ b/src/SMDS/SMDS_Downward.hxx @@ -77,8 +77,8 @@ public: virtual const int* getUpCells(int cellId) = 0; virtual const unsigned char* getUpTypes(int cellId) = 0; virtual void getNodeIds(int cellId, std::set& nodeSet) = 0; - virtual int getNodes(int cellId, int* nodevec) {return 0; } - virtual void getOrderedNodesOfFace(int cellId, std::vector& orderedNodes) {}; + virtual int getNodes(int /*cellId*/, int* /*nodevec*/) {return 0; } + virtual void getOrderedNodesOfFace(int /*cellId*/, std::vector& /*orderedNodes*/) {}; int getVtkCellId(int cellId) { return _vtkCellIds[cellId]; diff --git a/src/SMDS/SMDS_ElementFactory.hxx b/src/SMDS/SMDS_ElementFactory.hxx index 83f374d65..86d7408ce 100644 --- a/src/SMDS/SMDS_ElementFactory.hxx +++ b/src/SMDS/SMDS_ElementFactory.hxx @@ -231,7 +231,7 @@ struct _RangeSet * \brief Return ranges of indices (from,to) of elements having a given value */ bool GetIndices( const attr_t theValue, TIndexRanges & theIndices, - const attr_t* theMinValue = 0, const attr_t* theMaxValue = 0) const + const attr_t* /*theMinValue*/ = 0, const attr_t* /*theMaxValue*/ = 0) const { bool isFound = false; @@ -417,7 +417,7 @@ public: { min = false; max = true; return myUsedRanges; } //! Return ranges of elements assigned to sub-shapes and min/max of sub-shape IDs - const TSubIDRangeSet& GetSubIDRangesMinMax( int& min, int& max ) const + const TSubIDRangeSet& GetSubIDRangesMinMax( int& /*min*/, int& /*max*/ ) const { /*min = myMinSubID; max = myMaxSubID;*/ return mySubIDRanges; } //! Minimize allocated memory diff --git a/src/SMDS/SMDS_MemoryLimit.cxx b/src/SMDS/SMDS_MemoryLimit.cxx index bb3bb3fb8..426d63a92 100644 --- a/src/SMDS/SMDS_MemoryLimit.cxx +++ b/src/SMDS/SMDS_MemoryLimit.cxx @@ -33,7 +33,7 @@ #include #endif -int main (int argc, char ** argv) +int main () { // To better understand what is going on here, consult bug [SALOME platform 0019911] #if !defined WIN32 && !defined __APPLE__ diff --git a/src/SMDS/SMDS_Mesh.cxx b/src/SMDS/SMDS_Mesh.cxx index 353d07893..f2aee846a 100644 --- a/src/SMDS/SMDS_Mesh.cxx +++ b/src/SMDS/SMDS_Mesh.cxx @@ -68,7 +68,7 @@ int SMDS_Mesh::chunkSize = 1024; */ //================================================================================ -int SMDS_Mesh::CheckMemory(const bool doNotRaise) throw (std::bad_alloc) +int SMDS_Mesh::CheckMemory(const bool doNotRaise) { return -1; #if !defined WIN32 && !defined __APPLE__ diff --git a/src/SMDS/SMDS_Mesh.hxx b/src/SMDS/SMDS_Mesh.hxx index 9fa0642f8..7e54f5efe 100644 --- a/src/SMDS/SMDS_Mesh.hxx +++ b/src/SMDS/SMDS_Mesh.hxx @@ -679,7 +679,7 @@ public: * \param doNotRaise - if true, suppress exception, just return free memory size * \retval int - amount of available memory in MB or negative number in failure case */ - static int CheckMemory(const bool doNotRaise=false) throw (std::bad_alloc); + static int CheckMemory(const bool doNotRaise=false); virtual int MaxNodeID() const; virtual int MinNodeID() const; diff --git a/src/SMDS/SMDS_MeshGroup.hxx b/src/SMDS/SMDS_MeshGroup.hxx index 2b978c1b7..39807aab3 100644 --- a/src/SMDS/SMDS_MeshGroup.hxx +++ b/src/SMDS/SMDS_MeshGroup.hxx @@ -41,7 +41,7 @@ class SMDS_EXPORT SMDS_MeshGroup: public SMDS_MeshObject, SMDS_ElementHolder void SetType (const SMDSAbs_ElementType theType); void Clear(); - void Reserve(size_t nbElems) {} + void Reserve(size_t /*nbElems*/) {} bool Add(const SMDS_MeshElement * theElem); bool Remove(const SMDS_MeshElement * theElem); bool IsEmpty() const { return myElements.empty(); } diff --git a/src/SMDS/SMDS_MeshNode.hxx b/src/SMDS/SMDS_MeshNode.hxx index 4a96744b9..60d71f6c1 100644 --- a/src/SMDS/SMDS_MeshNode.hxx +++ b/src/SMDS/SMDS_MeshNode.hxx @@ -62,7 +62,7 @@ class SMDS_EXPORT SMDS_MeshNode: public SMDS_MeshElement virtual bool IsPoly() const { return false; } virtual bool IsQuadratic() const { return false; } - virtual bool IsMediumNode(const SMDS_MeshNode* node) const { return false; } + virtual bool IsMediumNode(const SMDS_MeshNode* /*node*/) const { return false; } virtual int NbCornerNodes() const { return 1; } void Print(std::ostream & OS) const; diff --git a/src/SMDS/SMDS_MeshVolume.cxx b/src/SMDS/SMDS_MeshVolume.cxx index 6cfcf47b9..67b3c773d 100644 --- a/src/SMDS/SMDS_MeshVolume.cxx +++ b/src/SMDS/SMDS_MeshVolume.cxx @@ -201,7 +201,7 @@ int SMDS_MeshVolume::GetNodeIndex( const SMDS_MeshNode* node ) const } return -1; } -bool SMDS_MeshVolume::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbNodes) +bool SMDS_MeshVolume::ChangeNodes(const SMDS_MeshNode* /*nodes*/[], const int /*nbNodes*/) { return false; } diff --git a/src/SMDS/SMDS_PolygonalFaceOfNodes.hxx b/src/SMDS/SMDS_PolygonalFaceOfNodes.hxx index 4d0706804..645a03762 100644 --- a/src/SMDS/SMDS_PolygonalFaceOfNodes.hxx +++ b/src/SMDS/SMDS_PolygonalFaceOfNodes.hxx @@ -40,7 +40,7 @@ class SMDS_EXPORT SMDS_PolygonalFaceOfNodes : public SMDS_CellOfNodes virtual SMDSAbs_GeometryType GetGeomType() const { return SMDSGeom_POLYGON; } virtual bool IsPoly() const { return true; } virtual bool IsQuadratic() const { return false; } - virtual bool IsMediumNode(const SMDS_MeshNode* node) const { return false; } + virtual bool IsMediumNode(const SMDS_MeshNode* /*node*/) const { return false; } virtual int NbCornerNodes() const { return NbNodes(); } virtual int NbNodes() const; diff --git a/src/SMDS/SMDS_Position.hxx b/src/SMDS/SMDS_Position.hxx index 30c09d93e..7e8dd30d5 100644 --- a/src/SMDS/SMDS_Position.hxx +++ b/src/SMDS/SMDS_Position.hxx @@ -62,7 +62,7 @@ class SMDS_Ptr : public std::unique_ptr< T > SMDS_Ptr( T * pos = (T *) 0, bool isOwner=true ): std::unique_ptr< T >( pos ), myIsOwner( isOwner ) {} - SMDS_Ptr( const SMDS_Ptr& from ) : myIsOwner( from.myIsOwner ) + SMDS_Ptr( const SMDS_Ptr& from ) : std::unique_ptr< T >(), myIsOwner( from.myIsOwner ) { this->swap( const_cast( from )); } SMDS_Ptr& operator=( const SMDS_Ptr& from ) diff --git a/src/SMDS/SMDS_SetIterator.hxx b/src/SMDS/SMDS_SetIterator.hxx index f9f1d5b08..c0439d512 100644 --- a/src/SMDS/SMDS_SetIterator.hxx +++ b/src/SMDS/SMDS_SetIterator.hxx @@ -63,7 +63,7 @@ namespace SMDS { template struct PassAllValueFilter { - bool operator()(const VALUE& t ) { return true; } + bool operator()(const VALUE& /*t*/ ) { return true; } }; template diff --git a/src/SMDS/SMDS_UnstructuredGrid.cxx b/src/SMDS/SMDS_UnstructuredGrid.cxx index 6140c5cf6..8da9a287b 100644 --- a/src/SMDS/SMDS_UnstructuredGrid.cxx +++ b/src/SMDS/SMDS_UnstructuredGrid.cxx @@ -336,7 +336,7 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector& idNodesOldToNew, int n } void SMDS_UnstructuredGrid::copyNodes(vtkPoints * newPoints, - std::vector& idNodesOldToNew, + std::vector& /*idNodesOldToNew*/, int& alreadyCopied, int start, int end) @@ -410,7 +410,7 @@ void SMDS_UnstructuredGrid::CleanDownwardConnectivity() * Downward connectivity is no more valid if vtkUnstructuredGrid is modified. * */ -void SMDS_UnstructuredGrid::BuildDownwardConnectivity(bool withEdges) +void SMDS_UnstructuredGrid::BuildDownwardConnectivity(bool /*withEdges*/) { MESSAGE("SMDS_UnstructuredGrid::BuildDownwardConnectivity");CHRONO(2); // TODO calcul partiel sans edges @@ -482,6 +482,7 @@ void SMDS_UnstructuredGrid::BuildDownwardConnectivity(bool withEdges) GuessSize[VTK_QUADRATIC_HEXAHEDRON] = nbQuadHexa; GuessSize[VTK_TRIQUADRATIC_HEXAHEDRON] = nbQuadHexa; GuessSize[VTK_HEXAGONAL_PRISM] = nbHexPrism; + (void)GuessSize; // unused in Release mode _downArray[VTK_LINE] ->allocate(nbLineGuess); _downArray[VTK_QUADRATIC_EDGE] ->allocate(nbQuadEdgeGuess); diff --git a/src/SMDS/SMDS_VolumeTool.cxx b/src/SMDS/SMDS_VolumeTool.cxx index 016ca4cf5..be3370ae0 100644 --- a/src/SMDS/SMDS_VolumeTool.cxx +++ b/src/SMDS/SMDS_VolumeTool.cxx @@ -1328,7 +1328,7 @@ int SMDS_VolumeTool::GetOppFaceIndex( int faceIndex ) const case 15: if ( faceIndex == 0 || faceIndex == 1 ) ind = 1 - faceIndex; - break; + break; case 8: case 12: if ( faceIndex <= 1 ) // top or bottom @@ -1488,10 +1488,10 @@ bool SMDS_VolumeTool::IsLinked (const int theNode1Index, case QUAD_TETRA: { switch ( minInd ) { - case 0: if( maxInd==4 || maxInd==6 || maxInd==7 ) return true; - case 1: if( maxInd==4 || maxInd==5 || maxInd==8 ) return true; - case 2: if( maxInd==5 || maxInd==6 || maxInd==9 ) return true; - case 3: if( maxInd==7 || maxInd==8 || maxInd==9 ) return true; + case 0: if( maxInd==4 || maxInd==6 || maxInd==7 ) return true; // fall through + case 1: if( maxInd==4 || maxInd==5 || maxInd==8 ) return true; // fall through + case 2: if( maxInd==5 || maxInd==6 || maxInd==9 ) return true; // fall through + case 3: if( maxInd==7 || maxInd==8 || maxInd==9 ) return true; // fall through default:; } break; @@ -1499,14 +1499,14 @@ bool SMDS_VolumeTool::IsLinked (const int theNode1Index, case QUAD_HEXA: { switch ( minInd ) { - case 0: if( maxInd==8 || maxInd==11 || maxInd==16 ) return true; - case 1: if( maxInd==8 || maxInd==9 || maxInd==17 ) return true; - case 2: if( maxInd==9 || maxInd==10 || maxInd==18 ) return true; - case 3: if( maxInd==10 || maxInd==11 || maxInd==19 ) return true; - case 4: if( maxInd==12 || maxInd==15 || maxInd==16 ) return true; - case 5: if( maxInd==12 || maxInd==13 || maxInd==17 ) return true; - case 6: if( maxInd==13 || maxInd==14 || maxInd==18 ) return true; - case 7: if( maxInd==14 || maxInd==15 || maxInd==19 ) return true; + case 0: if( maxInd==8 || maxInd==11 || maxInd==16 ) return true; // fall through + case 1: if( maxInd==8 || maxInd==9 || maxInd==17 ) return true; // fall through + case 2: if( maxInd==9 || maxInd==10 || maxInd==18 ) return true; // fall through + case 3: if( maxInd==10 || maxInd==11 || maxInd==19 ) return true; // fall through + case 4: if( maxInd==12 || maxInd==15 || maxInd==16 ) return true; // fall through + case 5: if( maxInd==12 || maxInd==13 || maxInd==17 ) return true; // fall through + case 6: if( maxInd==13 || maxInd==14 || maxInd==18 ) return true; // fall through + case 7: if( maxInd==14 || maxInd==15 || maxInd==19 ) return true; // fall through default:; } break; @@ -1514,10 +1514,10 @@ bool SMDS_VolumeTool::IsLinked (const int theNode1Index, case QUAD_PYRAM: { switch ( minInd ) { - case 0: if( maxInd==5 || maxInd==8 || maxInd==9 ) return true; - case 1: if( maxInd==5 || maxInd==6 || maxInd==10 ) return true; - case 2: if( maxInd==6 || maxInd==7 || maxInd==11 ) return true; - case 3: if( maxInd==7 || maxInd==8 || maxInd==12 ) return true; + case 0: if( maxInd==5 || maxInd==8 || maxInd==9 ) return true; // fall through + case 1: if( maxInd==5 || maxInd==6 || maxInd==10 ) return true; // fall through + case 2: if( maxInd==6 || maxInd==7 || maxInd==11 ) return true; // fall through + case 3: if( maxInd==7 || maxInd==8 || maxInd==12 ) return true; // fall through case 4: if( maxInd==9 || maxInd==10 || maxInd==11 || maxInd==12 ) return true; default:; } @@ -1526,12 +1526,12 @@ bool SMDS_VolumeTool::IsLinked (const int theNode1Index, case QUAD_PENTA: { switch ( minInd ) { - case 0: if( maxInd==6 || maxInd==8 || maxInd==12 ) return true; - case 1: if( maxInd==6 || maxInd==7 || maxInd==13 ) return true; - case 2: if( maxInd==7 || maxInd==8 || maxInd==14 ) return true; - case 3: if( maxInd==9 || maxInd==11 || maxInd==12 ) return true; - case 4: if( maxInd==9 || maxInd==10 || maxInd==13 ) return true; - case 5: if( maxInd==10 || maxInd==11 || maxInd==14 ) return true; + case 0: if( maxInd==6 || maxInd==8 || maxInd==12 ) return true; // fall through + case 1: if( maxInd==6 || maxInd==7 || maxInd==13 ) return true; // fall through + case 2: if( maxInd==7 || maxInd==8 || maxInd==14 ) return true; // fall through + case 3: if( maxInd==9 || maxInd==11 || maxInd==12 ) return true; // fall through + case 4: if( maxInd==9 || maxInd==10 || maxInd==13 ) return true; // fall through + case 5: if( maxInd==10 || maxInd==11 || maxInd==14 ) return true; // fall through default:; } break; diff --git a/src/SMESH/SMESH_Algo.cxx b/src/SMESH/SMESH_Algo.cxx index bdc93b1a1..44555e3d9 100644 --- a/src/SMESH/SMESH_Algo.cxx +++ b/src/SMESH/SMESH_Algo.cxx @@ -518,7 +518,7 @@ GeomAbs_Shape SMESH_Algo::Continuity(const TopoDS_Edge& theE1, OCC_CATCH_SIGNALS; return BRepLProp::Continuity(C1, C2, u1, u2, tol, angTol); } - catch (Standard_Failure) { + catch (Standard_Failure&) { } return GeomAbs_C0; } @@ -858,7 +858,7 @@ bool SMESH_Algo::Compute(SMESH_Mesh & /*aMesh*/, SMESH_MesherHelper* /*aHelper*/ //purpose : Return true if the algorithm can mesh a given shape //======================================================================= -bool SMESH_Algo::IsApplicableToShape(const TopoDS_Shape & shape, bool toCheckAll) const +bool SMESH_Algo::IsApplicableToShape(const TopoDS_Shape & /*shape*/, bool /*toCheckAll*/) const { return true; } @@ -1261,7 +1261,7 @@ bool SMESH_2D_Algo::FixInternalNodes(const SMESH_ProxyMesh& mesh, //purpose : Return true if the algorithm can mesh a given shape //======================================================================= -bool SMESH_1D_Algo::IsApplicableToShape(const TopoDS_Shape & shape, bool toCheckAll) const +bool SMESH_1D_Algo::IsApplicableToShape(const TopoDS_Shape & shape, bool /*toCheckAll*/) const { return ( !shape.IsNull() && TopExp_Explorer( shape, TopAbs_EDGE ).More() ); } @@ -1271,7 +1271,7 @@ bool SMESH_1D_Algo::IsApplicableToShape(const TopoDS_Shape & shape, bool toCheck //purpose : Return true if the algorithm can mesh a given shape //======================================================================= -bool SMESH_2D_Algo::IsApplicableToShape(const TopoDS_Shape & shape, bool toCheckAll) const +bool SMESH_2D_Algo::IsApplicableToShape(const TopoDS_Shape & shape, bool /*toCheckAll*/) const { return ( !shape.IsNull() && TopExp_Explorer( shape, TopAbs_FACE ).More() ); } @@ -1281,7 +1281,7 @@ bool SMESH_2D_Algo::IsApplicableToShape(const TopoDS_Shape & shape, bool toCheck //purpose : Return true if the algorithm can mesh a given shape //======================================================================= -bool SMESH_3D_Algo::IsApplicableToShape(const TopoDS_Shape & shape, bool toCheckAll) const +bool SMESH_3D_Algo::IsApplicableToShape(const TopoDS_Shape & shape, bool /*toCheckAll*/) const { return ( !shape.IsNull() && TopExp_Explorer( shape, TopAbs_SOLID ).More() ); } diff --git a/src/SMESH/SMESH_Gen.cxx b/src/SMESH/SMESH_Gen.cxx index 663531180..e07b35552 100644 --- a/src/SMESH/SMESH_Gen.cxx +++ b/src/SMESH/SMESH_Gen.cxx @@ -142,7 +142,6 @@ SMESH_Gen::~SMESH_Gen() //============================================================================= SMESH_Mesh* SMESH_Gen::CreateMesh(bool theIsEmbeddedMode) - throw(SALOME_Exception) { Unexpect aCatch(SalomeException); @@ -453,8 +452,8 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, * Prepare Compute a mesh */ //============================================================================= -void SMESH_Gen::PrepareCompute(SMESH_Mesh & aMesh, - const TopoDS_Shape & aShape) +void SMESH_Gen::PrepareCompute(SMESH_Mesh & /*aMesh*/, + const TopoDS_Shape & /*aShape*/) { _compute_canceled = false; resetCurrentSubMesh(); @@ -465,8 +464,8 @@ void SMESH_Gen::PrepareCompute(SMESH_Mesh & aMesh, * Cancel Compute a mesh */ //============================================================================= -void SMESH_Gen::CancelCompute(SMESH_Mesh & aMesh, - const TopoDS_Shape & aShape) +void SMESH_Gen::CancelCompute(SMESH_Mesh & /*aMesh*/, + const TopoDS_Shape & /*aShape*/) { _compute_canceled = true; if ( const SMESH_subMesh* sm = GetCurrentSubMesh() ) @@ -1053,10 +1052,10 @@ std::vector< std::string > SMESH_Gen::GetPluginXMLPaths() } // get a separator from rootDir - for ( pos = strlen( rootDir )-1; pos >= 0 && sep.empty(); --pos ) - if ( rootDir[pos] == '/' || rootDir[pos] == '\\' ) + for ( int i = strlen( rootDir )-1; i >= 0 && sep.empty(); --i ) + if ( rootDir[i] == '/' || rootDir[i] == '\\' ) { - sep = rootDir[pos]; + sep = rootDir[i]; break; } #ifdef WIN32 diff --git a/src/SMESH/SMESH_Gen.hxx b/src/SMESH/SMESH_Gen.hxx index e73fe6175..2a3bc6423 100644 --- a/src/SMESH/SMESH_Gen.hxx +++ b/src/SMESH/SMESH_Gen.hxx @@ -67,8 +67,7 @@ public: SMESH_Gen(); ~SMESH_Gen(); - SMESH_Mesh* CreateMesh(bool theIsEmbeddedMode) - throw(SALOME_Exception); + SMESH_Mesh* CreateMesh(bool theIsEmbeddedMode); enum ComputeFlags { diff --git a/src/SMESH/SMESH_HypoFilter.cxx b/src/SMESH/SMESH_HypoFilter.cxx index ecbd64bdc..6d49c5f56 100644 --- a/src/SMESH/SMESH_HypoFilter.cxx +++ b/src/SMESH/SMESH_HypoFilter.cxx @@ -57,7 +57,7 @@ bool SMESH_HypoFilter::NamePredicate::IsOk (const SMESH_Hypothesis* aHyp, int SMESH_HypoFilter::TypePredicate::Value( const SMESH_Hypothesis* aHyp ) const { return aHyp->GetType(); -}; +} //======================================================================= //function : DimPredicate::Value @@ -78,7 +78,7 @@ bool SMESH_HypoFilter::ApplicablePredicate::IsOk(const SMESH_Hypothesis* aHyp, const TopoDS_Shape& /*aShape*/) const { return SMESH_subMesh::IsApplicableHypothesis( aHyp, (TopAbs_ShapeEnum)_shapeType ); -}; +} //======================================================================= //function : IsAuxiliaryPredicate::IsOk @@ -89,7 +89,7 @@ bool SMESH_HypoFilter::IsAuxiliaryPredicate::IsOk(const SMESH_Hypothesis* aHyp, const TopoDS_Shape& /*aShape*/) const { return aHyp->IsAuxiliary(); -}; +} //======================================================================= //function : ApplicablePredicate::ApplicablePredicate @@ -117,7 +117,7 @@ bool SMESH_HypoFilter::InstancePredicate::IsOk(const SMESH_Hypothesis* aHyp, //purpose : //======================================================================= -bool SMESH_HypoFilter::IsAssignedToPredicate::IsOk(const SMESH_Hypothesis* aHyp, +bool SMESH_HypoFilter::IsAssignedToPredicate::IsOk(const SMESH_Hypothesis* /*aHyp*/, const TopoDS_Shape& aShape) const { return ( !_mainShape.IsNull() && !aShape.IsNull() && _mainShape.IsSame( aShape )); diff --git a/src/SMESH/SMESH_HypoFilter.hxx b/src/SMESH/SMESH_HypoFilter.hxx index 5af5a23f5..32a7389d2 100644 --- a/src/SMESH/SMESH_HypoFilter.hxx +++ b/src/SMESH/SMESH_HypoFilter.hxx @@ -107,7 +107,7 @@ class SMESH_EXPORT SMESH_HypoFilter: public SMESH_HypoPredicate enum Logical { AND, AND_NOT, OR, OR_NOT }; enum Comparison { EQUAL, NOT_EQUAL, MORE, LESS }; - SMESH_HypoFilter(const SMESH_HypoFilter& other){} + SMESH_HypoFilter(const SMESH_HypoFilter& /*other*/){} void add( Logical bool_op, SMESH_HypoPredicate* pred ) { diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx index e71853f0f..963d0f42d 100644 --- a/src/SMESH/SMESH_Mesh.cxx +++ b/src/SMESH/SMESH_Mesh.cxx @@ -618,7 +618,7 @@ SMESH_ComputeErrorPtr SMESH_Mesh::GMFToMesh(const char* theFileName, SMESH_Hypothesis::Hypothesis_Status SMESH_Mesh::AddHypothesis(const TopoDS_Shape & aSubShape, int anHypId, - std::string* anError ) throw(SALOME_Exception) + std::string* anError ) { Unexpect aCatch(SalomeException); if(MYDEBUG) MESSAGE("SMESH_Mesh::AddHypothesis"); @@ -713,7 +713,7 @@ SMESH_Mesh::AddHypothesis(const TopoDS_Shape & aSubShape, SMESH_Hypothesis::Hypothesis_Status SMESH_Mesh::RemoveHypothesis(const TopoDS_Shape & aSubShape, - int anHypId) throw( SALOME_Exception ) + int anHypId) { Unexpect aCatch(SalomeException); if(MYDEBUG) MESSAGE("SMESH_Mesh::RemoveHypothesis"); @@ -784,7 +784,6 @@ SMESH_Mesh::RemoveHypothesis(const TopoDS_Shape & aSubShape, const std::list& SMESH_Mesh::GetHypothesisList(const TopoDS_Shape & aSubShape) const - throw(SALOME_Exception) { return _myMeshDS->GetHypothesis(aSubShape); } @@ -993,7 +992,7 @@ SMESH_Hypothesis * SMESH_Mesh::GetHypothesis(const int anHypId) const */ //============================================================================= -const std::list & SMESH_Mesh::GetLog() throw(SALOME_Exception) +const std::list & SMESH_Mesh::GetLog() { Unexpect aCatch(SalomeException); return _myMeshDS->GetScript()->GetCommands(); @@ -1004,7 +1003,7 @@ const std::list & SMESH_Mesh::GetLog() throw(SALOME_Exception) * */ //============================================================================= -void SMESH_Mesh::ClearLog() throw(SALOME_Exception) +void SMESH_Mesh::ClearLog() { Unexpect aCatch(SalomeException); _myMeshDS->GetScript()->Clear(); @@ -1017,7 +1016,6 @@ void SMESH_Mesh::ClearLog() throw(SALOME_Exception) //============================================================================= SMESH_subMesh * SMESH_Mesh::GetSubMesh(const TopoDS_Shape & aSubShape) - throw(SALOME_Exception) { int index = _myMeshDS->ShapeToIndex(aSubShape); if ( !index && aSubShape.IsNull() ) @@ -1070,7 +1068,6 @@ SMESH_subMesh * SMESH_Mesh::GetSubMesh(const TopoDS_Shape & aSubShape) //============================================================================= SMESH_subMesh *SMESH_Mesh::GetSubMeshContaining(const TopoDS_Shape & aSubShape) const - throw(SALOME_Exception) { int index = _myMeshDS->ShapeToIndex(aSubShape); return GetSubMeshContaining( index ); @@ -1084,10 +1081,8 @@ SMESH_subMesh *SMESH_Mesh::GetSubMeshContaining(const TopoDS_Shape & aSubShape) //============================================================================= SMESH_subMesh *SMESH_Mesh::GetSubMeshContaining(const int aShapeID) const -throw(SALOME_Exception) { SMESH_subMesh *aSubMesh = _subMeshHolder->Get( aShapeID ); - return aSubMesh; } @@ -1099,7 +1094,6 @@ throw(SALOME_Exception) std::list SMESH_Mesh::GetGroupSubMeshesContaining(const TopoDS_Shape & aSubShape) const - throw(SALOME_Exception) { std::list found; @@ -1273,13 +1267,13 @@ void SMESH_Mesh::NotifySubMeshesHypothesisModification(const SMESH_Hypothesis* h * Auto color functionality */ //============================================================================= -void SMESH_Mesh::SetAutoColor(bool theAutoColor) throw(SALOME_Exception) +void SMESH_Mesh::SetAutoColor(bool theAutoColor) { Unexpect aCatch(SalomeException); _isAutoColor = theAutoColor; } -bool SMESH_Mesh::GetAutoColor() throw(SALOME_Exception) +bool SMESH_Mesh::GetAutoColor() { Unexpect aCatch(SalomeException); return _isAutoColor; @@ -1432,7 +1426,6 @@ void SMESH_Mesh::ExportMED(const char * file, bool theAddODOnVertices, double theZTolerance, bool theAllElemsToGroup) -throw(SALOME_Exception) { MESSAGE("MED_VERSION:"<< theVersion); SMESH_TRY; @@ -1503,7 +1496,6 @@ throw(SALOME_Exception) void SMESH_Mesh::ExportSAUV(const char *file, const char* theMeshName, bool theAutoGroups) - throw(SALOME_Exception) { std::string medfilename(file); medfilename += ".med"; @@ -1547,7 +1539,7 @@ void SMESH_Mesh::ExportSAUV(const char *file, //================================================================================ void SMESH_Mesh::ExportDAT(const char * file, - const SMESHDS_Mesh* meshPart) throw(SALOME_Exception) + const SMESHDS_Mesh* meshPart) { Unexpect aCatch(SalomeException); DriverDAT_W_SMDS_Mesh myWriter; @@ -1564,7 +1556,7 @@ void SMESH_Mesh::ExportDAT(const char * file, //================================================================================ void SMESH_Mesh::ExportUNV(const char * file, - const SMESHDS_Mesh* meshPart) throw(SALOME_Exception) + const SMESHDS_Mesh* meshPart) { Unexpect aCatch(SalomeException); DriverUNV_W_SMDS_Mesh myWriter; @@ -1599,7 +1591,7 @@ void SMESH_Mesh::ExportUNV(const char * file, void SMESH_Mesh::ExportSTL(const char * file, const bool isascii, const char * name, - const SMESHDS_Mesh* meshPart) throw(SALOME_Exception) + const SMESHDS_Mesh* meshPart) { Unexpect aCatch(SalomeException); DriverSTL_W_SMDS_Mesh myWriter; @@ -1754,7 +1746,7 @@ double SMESH_Mesh::GetComputeProgress() const */ //================================================================================ -int SMESH_Mesh::NbNodes() const throw(SALOME_Exception) +int SMESH_Mesh::NbNodes() const { Unexpect aCatch(SalomeException); return _myMeshDS->NbNodes(); @@ -1766,7 +1758,7 @@ int SMESH_Mesh::NbNodes() const throw(SALOME_Exception) */ //================================================================================ -int SMESH_Mesh::Nb0DElements() const throw(SALOME_Exception) +int SMESH_Mesh::Nb0DElements() const { Unexpect aCatch(SalomeException); return _myMeshDS->GetMeshInfo().Nb0DElements(); @@ -1778,7 +1770,7 @@ int SMESH_Mesh::Nb0DElements() const throw(SALOME_Exception) */ //================================================================================ -int SMESH_Mesh::NbEdges(SMDSAbs_ElementOrder order) const throw(SALOME_Exception) +int SMESH_Mesh::NbEdges(SMDSAbs_ElementOrder order) const { Unexpect aCatch(SalomeException); return _myMeshDS->GetMeshInfo().NbEdges(order); @@ -1790,7 +1782,7 @@ int SMESH_Mesh::NbEdges(SMDSAbs_ElementOrder order) const throw(SALOME_Exception */ //================================================================================ -int SMESH_Mesh::NbFaces(SMDSAbs_ElementOrder order) const throw(SALOME_Exception) +int SMESH_Mesh::NbFaces(SMDSAbs_ElementOrder order) const { Unexpect aCatch(SalomeException); return _myMeshDS->GetMeshInfo().NbFaces(order); @@ -1802,7 +1794,7 @@ int SMESH_Mesh::NbFaces(SMDSAbs_ElementOrder order) const throw(SALOME_Exception */ //================================================================================ -int SMESH_Mesh::NbTriangles(SMDSAbs_ElementOrder order) const throw(SALOME_Exception) +int SMESH_Mesh::NbTriangles(SMDSAbs_ElementOrder order) const { Unexpect aCatch(SalomeException); return _myMeshDS->GetMeshInfo().NbTriangles(order); @@ -1814,7 +1806,7 @@ int SMESH_Mesh::NbTriangles(SMDSAbs_ElementOrder order) const throw(SALOME_Excep */ //================================================================================ -int SMESH_Mesh::NbBiQuadTriangles() const throw(SALOME_Exception) +int SMESH_Mesh::NbBiQuadTriangles() const { Unexpect aCatch(SalomeException); return _myMeshDS->GetMeshInfo().NbBiQuadTriangles(); @@ -1826,7 +1818,7 @@ int SMESH_Mesh::NbBiQuadTriangles() const throw(SALOME_Exception) */ //================================================================================ -int SMESH_Mesh::NbQuadrangles(SMDSAbs_ElementOrder order) const throw(SALOME_Exception) +int SMESH_Mesh::NbQuadrangles(SMDSAbs_ElementOrder order) const { Unexpect aCatch(SalomeException); return _myMeshDS->GetMeshInfo().NbQuadrangles(order); @@ -1838,7 +1830,7 @@ int SMESH_Mesh::NbQuadrangles(SMDSAbs_ElementOrder order) const throw(SALOME_Exc */ //================================================================================ -int SMESH_Mesh::NbBiQuadQuadrangles() const throw(SALOME_Exception) +int SMESH_Mesh::NbBiQuadQuadrangles() const { Unexpect aCatch(SalomeException); return _myMeshDS->GetMeshInfo().NbBiQuadQuadrangles(); @@ -1850,7 +1842,7 @@ int SMESH_Mesh::NbBiQuadQuadrangles() const throw(SALOME_Exception) */ //================================================================================ -int SMESH_Mesh::NbPolygons(SMDSAbs_ElementOrder order) const throw(SALOME_Exception) +int SMESH_Mesh::NbPolygons(SMDSAbs_ElementOrder order) const { Unexpect aCatch(SalomeException); return _myMeshDS->GetMeshInfo().NbPolygons(order); @@ -1862,7 +1854,7 @@ int SMESH_Mesh::NbPolygons(SMDSAbs_ElementOrder order) const throw(SALOME_Except */ //================================================================================ -int SMESH_Mesh::NbVolumes(SMDSAbs_ElementOrder order) const throw(SALOME_Exception) +int SMESH_Mesh::NbVolumes(SMDSAbs_ElementOrder order) const { Unexpect aCatch(SalomeException); return _myMeshDS->GetMeshInfo().NbVolumes(order); @@ -1874,7 +1866,7 @@ int SMESH_Mesh::NbVolumes(SMDSAbs_ElementOrder order) const throw(SALOME_Excepti */ //================================================================================ -int SMESH_Mesh::NbTetras(SMDSAbs_ElementOrder order) const throw(SALOME_Exception) +int SMESH_Mesh::NbTetras(SMDSAbs_ElementOrder order) const { Unexpect aCatch(SalomeException); return _myMeshDS->GetMeshInfo().NbTetras(order); @@ -1886,7 +1878,7 @@ int SMESH_Mesh::NbTetras(SMDSAbs_ElementOrder order) const throw(SALOME_Exceptio */ //================================================================================ -int SMESH_Mesh::NbHexas(SMDSAbs_ElementOrder order) const throw(SALOME_Exception) +int SMESH_Mesh::NbHexas(SMDSAbs_ElementOrder order) const { Unexpect aCatch(SalomeException); return _myMeshDS->GetMeshInfo().NbHexas(order); @@ -1898,7 +1890,7 @@ int SMESH_Mesh::NbHexas(SMDSAbs_ElementOrder order) const throw(SALOME_Exception */ //================================================================================ -int SMESH_Mesh::NbTriQuadraticHexas() const throw(SALOME_Exception) +int SMESH_Mesh::NbTriQuadraticHexas() const { Unexpect aCatch(SalomeException); return _myMeshDS->GetMeshInfo().NbTriQuadHexas(); @@ -1910,7 +1902,7 @@ int SMESH_Mesh::NbTriQuadraticHexas() const throw(SALOME_Exception) */ //================================================================================ -int SMESH_Mesh::NbPyramids(SMDSAbs_ElementOrder order) const throw(SALOME_Exception) +int SMESH_Mesh::NbPyramids(SMDSAbs_ElementOrder order) const { Unexpect aCatch(SalomeException); return _myMeshDS->GetMeshInfo().NbPyramids(order); @@ -1922,19 +1914,19 @@ int SMESH_Mesh::NbPyramids(SMDSAbs_ElementOrder order) const throw(SALOME_Except */ //================================================================================ -int SMESH_Mesh::NbPrisms(SMDSAbs_ElementOrder order) const throw(SALOME_Exception) +int SMESH_Mesh::NbPrisms(SMDSAbs_ElementOrder order) const { Unexpect aCatch(SalomeException); return _myMeshDS->GetMeshInfo().NbPrisms(order); } -int SMESH_Mesh::NbQuadPrisms() const throw (SALOME_Exception) +int SMESH_Mesh::NbQuadPrisms() const { Unexpect aCatch(SalomeException); return _myMeshDS->GetMeshInfo().NbQuadPrisms(); } -int SMESH_Mesh::NbBiQuadPrisms() const throw (SALOME_Exception) +int SMESH_Mesh::NbBiQuadPrisms() const { Unexpect aCatch(SalomeException); return _myMeshDS->GetMeshInfo().NbBiQuadPrisms(); @@ -1947,7 +1939,7 @@ int SMESH_Mesh::NbBiQuadPrisms() const throw (SALOME_Exception) */ //================================================================================ -int SMESH_Mesh::NbHexagonalPrisms() const throw(SALOME_Exception) +int SMESH_Mesh::NbHexagonalPrisms() const { Unexpect aCatch(SalomeException); return _myMeshDS->GetMeshInfo().NbHexPrisms(); @@ -1959,7 +1951,7 @@ int SMESH_Mesh::NbHexagonalPrisms() const throw(SALOME_Exception) */ //================================================================================ -int SMESH_Mesh::NbPolyhedrons() const throw(SALOME_Exception) +int SMESH_Mesh::NbPolyhedrons() const { Unexpect aCatch(SalomeException); return _myMeshDS->GetMeshInfo().NbPolyhedrons(); @@ -1971,7 +1963,7 @@ int SMESH_Mesh::NbPolyhedrons() const throw(SALOME_Exception) */ //================================================================================ -int SMESH_Mesh::NbBalls() const throw(SALOME_Exception) +int SMESH_Mesh::NbBalls() const { Unexpect aCatch(SalomeException); return _myMeshDS->GetMeshInfo().NbBalls(); @@ -1983,7 +1975,7 @@ int SMESH_Mesh::NbBalls() const throw(SALOME_Exception) */ //================================================================================ -int SMESH_Mesh::NbSubMesh() const throw(SALOME_Exception) +int SMESH_Mesh::NbSubMesh() const { Unexpect aCatch(SalomeException); return _myMeshDS->NbSubMesh(); @@ -2062,7 +2054,7 @@ SMESH_Group* SMESH_Mesh::AddGroup (const SMDSAbs_ElementType theType, */ //================================================================================ -SMESH_Group* SMESH_Mesh::AddGroup (SMESHDS_GroupBase* groupDS) throw(SALOME_Exception) +SMESH_Group* SMESH_Mesh::AddGroup (SMESHDS_GroupBase* groupDS) { if ( !groupDS ) throw SALOME_Exception(LOCALIZED ("SMESH_Mesh::AddGroup(): NULL SMESHDS_GroupBase")); @@ -2414,18 +2406,19 @@ void SMESH_Mesh::fillAncestorsMap(const TopoDS_Shape& theShape) bool SMESH_Mesh::SortByMeshOrder(std::vector& theListToSort) const { - if ( !_mySubMeshOrder.size() || theListToSort.size() < 2) + if ( _mySubMeshOrder.empty() || theListToSort.size() < 2 ) return true; - - bool res = false; - std::vector onlyOrderedList, smVec; - // collect all ordered submeshes in one list as pointers + + // collect all ordered sub-meshes in smVec as pointers // and get their positions within theListToSort + + std::vector smVec; typedef std::vector::iterator TPosInList; - std::map< int, TPosInList > sortedPos; + std::map< size_t, size_t > sortedPos; // index in theListToSort to order TPosInList smBeg = theListToSort.begin(), smEnd = theListToSort.end(); TListOfListOfInt::const_iterator listIdsIt = _mySubMeshOrder.begin(); + bool needSort = false; for( ; listIdsIt != _mySubMeshOrder.end(); listIdsIt++) { const TListOfInt& listOfId = *listIdsIt; @@ -2452,27 +2445,46 @@ bool SMESH_Mesh::SortByMeshOrder(std::vector& theListToSort) con // find smVec items in theListToSort for ( size_t i = 0; i < smVec.size(); ++i ) { - TPosInList smPos = find( smBeg, smEnd, smVec[i] ); - if ( smPos != smEnd ) { - sortedPos[ std::distance( smBeg, smPos )] = smPos; - if ( sortedPos.size() > onlyOrderedList.size() ) - onlyOrderedList.push_back( smVec[i] ); + TPosInList smPos = find( smBeg, smEnd, smVec[i] ); // position in theListToSort + if ( smPos != smEnd ) + { + size_t posInList = std::distance( smBeg, smPos ); + size_t order = sortedPos.size(); + sortedPos.insert( std::make_pair( posInList, order )); + if ( posInList != order ) + needSort = true; } } } - if (onlyOrderedList.size() < 2) - return res; - res = true; + if ( ! needSort ) + return false; - std::vector::iterator onlyBIt = onlyOrderedList.begin(); - std::vector::iterator onlyEIt = onlyOrderedList.end(); + // set sm of sortedPos from theListToSort to front of orderedSM + // and the rest of theListToSort to orderedSM end - // iterate on ordered sub-meshes and insert them in detected positions - std::map< int, TPosInList >::iterator i_pos = sortedPos.begin(); - for ( ; onlyBIt != onlyEIt; ++onlyBIt, ++i_pos ) - *(i_pos->second) = *onlyBIt; + std::vector orderedSM; + orderedSM.reserve( theListToSort.size() ); + orderedSM.resize( sortedPos.size() ); - return res; + size_t iPrev = 0; + sortedPos.insert( std::make_pair( theListToSort.size(), sortedPos.size() )); + for ( const auto & pos_order : sortedPos ) + { + const size_t& posInList = pos_order.first; + const size_t& order = pos_order.second; + if ( order < sortedPos.size() - 1 ) + orderedSM[ order ] = theListToSort[ posInList ]; + + if ( iPrev < posInList ) + orderedSM.insert( orderedSM.end(), + theListToSort.begin() + iPrev, + theListToSort.begin() + posInList ); + iPrev = posInList + 1; + } + + theListToSort.swap( orderedSM ); + + return true; } //================================================================================ diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx index 18c11c894..4f9a3179d 100644 --- a/src/SMESH/SMESH_Mesh.hxx +++ b/src/SMESH/SMESH_Mesh.hxx @@ -132,16 +132,13 @@ class SMESH_EXPORT SMESH_Mesh bool theMakeRequiredGroups = true ); SMESH_Hypothesis::Hypothesis_Status - AddHypothesis(const TopoDS_Shape & aSubShape, int anHypId, std::string* error=0) - throw(SALOME_Exception); + AddHypothesis(const TopoDS_Shape & aSubShape, int anHypId, std::string* error=0); SMESH_Hypothesis::Hypothesis_Status - RemoveHypothesis(const TopoDS_Shape & aSubShape, int anHypId) - throw(SALOME_Exception); + RemoveHypothesis(const TopoDS_Shape & aSubShape, int anHypId); const std::list & - GetHypothesisList(const TopoDS_Shape & aSubShape) const - throw(SALOME_Exception); + GetHypothesisList(const TopoDS_Shape & aSubShape) const; const SMESH_Hypothesis * GetHypothesis(const TopoDS_Shape & aSubShape, const SMESH_HypoFilter& aFilter, @@ -167,9 +164,9 @@ class SMESH_EXPORT SMESH_Mesh SMESH_Hypothesis * GetHypothesis(const int aHypID) const; - const std::list & GetLog() throw(SALOME_Exception); + const std::list & GetLog(); - void ClearLog() throw(SALOME_Exception); + void ClearLog(); int GetId() const { return _id; } @@ -183,19 +180,15 @@ class SMESH_EXPORT SMESH_Mesh SMESH_Gen *GetGen() { return _gen; } - SMESH_subMesh *GetSubMesh(const TopoDS_Shape & aSubShape) - throw(SALOME_Exception); + SMESH_subMesh *GetSubMesh(const TopoDS_Shape & aSubShape); - SMESH_subMesh *GetSubMeshContaining(const TopoDS_Shape & aSubShape) const - throw(SALOME_Exception); + SMESH_subMesh *GetSubMeshContaining(const TopoDS_Shape & aSubShape) const; - SMESH_subMesh *GetSubMeshContaining(const int aShapeID) const - throw(SALOME_Exception); + SMESH_subMesh *GetSubMeshContaining(const int aShapeID) const; /*! * \brief Return submeshes of groups containing the given subshape */ - std::list GetGroupSubMeshesContaining(const TopoDS_Shape & shape) const - throw(SALOME_Exception); + std::list GetGroupSubMeshesContaining(const TopoDS_Shape & shape) const; /*! * \brief Say all submeshes that theChangedHyp has been modified */ @@ -223,9 +216,9 @@ class SMESH_EXPORT SMESH_Mesh */ const TopTools_ListOfShape& GetAncestors(const TopoDS_Shape& theSubShape) const; - void SetAutoColor(bool theAutoColor) throw(SALOME_Exception); + void SetAutoColor(bool theAutoColor); - bool GetAutoColor() throw(SALOME_Exception); + bool GetAutoColor(); /*! * \brief Set the flag meaning that the mesh has been edited "manually". @@ -266,17 +259,16 @@ class SMESH_EXPORT SMESH_Mesh bool theAutoDimension = false, bool theAddODOnVertices = false, double theZTolerance = -1., - bool theAllElemsToGroup = false) - throw(SALOME_Exception); + bool theAllElemsToGroup = false); void ExportDAT(const char * file, - const SMESHDS_Mesh* meshPart = 0) throw(SALOME_Exception); + const SMESHDS_Mesh* meshPart = 0); void ExportUNV(const char * file, - const SMESHDS_Mesh* meshPart = 0) throw(SALOME_Exception); + const SMESHDS_Mesh* meshPart = 0); void ExportSTL(const char * file, const bool isascii, const char * name = 0, - const SMESHDS_Mesh* meshPart = 0) throw(SALOME_Exception); + const SMESHDS_Mesh* meshPart = 0); void ExportCGNS(const char * file, const SMESHDS_Mesh* mesh, const char * meshName = 0, @@ -286,35 +278,35 @@ class SMESH_EXPORT SMESH_Mesh bool withRequiredGroups = true ); void ExportSAUV(const char *file, const char* theMeshName = NULL, - bool theAutoGroups = true) throw(SALOME_Exception); + bool theAutoGroups = true); double GetComputeProgress() const; - int NbNodes() const throw(SALOME_Exception); - int Nb0DElements() const throw(SALOME_Exception); - int NbBalls() const throw(SALOME_Exception); + int NbNodes() const; + int Nb0DElements() const; + int NbBalls() const; - int NbEdges(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); + int NbEdges(SMDSAbs_ElementOrder order = ORDER_ANY) const; - int NbFaces(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); - int NbTriangles(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); - int NbQuadrangles(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); - int NbBiQuadQuadrangles() const throw(SALOME_Exception); - int NbBiQuadTriangles() const throw(SALOME_Exception); - int NbPolygons(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); + int NbFaces(SMDSAbs_ElementOrder order = ORDER_ANY) const; + int NbTriangles(SMDSAbs_ElementOrder order = ORDER_ANY) const; + int NbQuadrangles(SMDSAbs_ElementOrder order = ORDER_ANY) const; + int NbBiQuadQuadrangles() const; + int NbBiQuadTriangles() const; + int NbPolygons(SMDSAbs_ElementOrder order = ORDER_ANY) const; - int NbVolumes(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); - int NbTetras(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); - int NbHexas(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); - int NbTriQuadraticHexas() const throw(SALOME_Exception); - int NbPyramids(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); - int NbPrisms(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); - int NbQuadPrisms() const throw(SALOME_Exception); - int NbBiQuadPrisms() const throw(SALOME_Exception); - int NbHexagonalPrisms() const throw(SALOME_Exception); - int NbPolyhedrons() const throw(SALOME_Exception); + int NbVolumes(SMDSAbs_ElementOrder order = ORDER_ANY) const; + int NbTetras(SMDSAbs_ElementOrder order = ORDER_ANY) const; + int NbHexas(SMDSAbs_ElementOrder order = ORDER_ANY) const; + int NbTriQuadraticHexas() const; + int NbPyramids(SMDSAbs_ElementOrder order = ORDER_ANY) const; + int NbPrisms(SMDSAbs_ElementOrder order = ORDER_ANY) const; + int NbQuadPrisms() const; + int NbBiQuadPrisms() const; + int NbHexagonalPrisms() const; + int NbPolyhedrons() const; - int NbSubMesh() const throw(SALOME_Exception); + int NbSubMesh() const; int NbGroup() const { return _mapGroup.size(); } @@ -326,7 +318,7 @@ class SMESH_EXPORT SMESH_Mesh const TopoDS_Shape& theShape = TopoDS_Shape(), const SMESH_PredicatePtr& thePredicate = SMESH_PredicatePtr()); - SMESH_Group* AddGroup (SMESHDS_GroupBase* groupDS) throw(SALOME_Exception); + SMESH_Group* AddGroup (SMESHDS_GroupBase* groupDS); typedef boost::shared_ptr< SMDS_Iterator > GroupIteratorPtr; GroupIteratorPtr GetGroups() const; diff --git a/src/SMESH/SMESH_MeshEditor.cxx b/src/SMESH/SMESH_MeshEditor.cxx index 1d679c2bc..3771280ca 100644 --- a/src/SMESH/SMESH_MeshEditor.cxx +++ b/src/SMESH/SMESH_MeshEditor.cxx @@ -3857,9 +3857,9 @@ void SMESH_MeshEditor::Smooth (TIDSortedElemSet & theElems, } else { if ( isUPeriodic ) - newUV.SetX( ElCLib::InPeriod( newUV.X(), u1, u2 )); + newUV.SetX( ElCLib::InPeriod( newUV.X(), u1, u2 )); // todo: u may be used unitialized if ( isVPeriodic ) - newUV.SetY( ElCLib::InPeriod( newUV.Y(), v1, v2 )); + newUV.SetY( ElCLib::InPeriod( newUV.Y(), v1, v2 )); // todo: v may be used unitialized // check new UV // if ( posType != SMDS_TOP_3DSPACE ) // dist2 = pNode.SquareDistance( surface->Value( newUV.X(), newUV.Y() )); @@ -5666,10 +5666,10 @@ makeNodesByNormal2D( SMESHDS_Mesh* mesh, //======================================================================= int SMESH_MeshEditor::ExtrusParam:: -makeNodesByNormal1D( SMESHDS_Mesh* mesh, - const SMDS_MeshNode* srcNode, - std::list & newNodes, - const bool makeMediumNodes) +makeNodesByNormal1D( SMESHDS_Mesh* /*mesh*/, + const SMDS_MeshNode* /*srcNode*/, + std::list & /*newNodes*/, + const bool /*makeMediumNodes*/) { throw SALOME_Exception("Extrusion 1D by Normal not implemented"); return 0; @@ -6070,6 +6070,7 @@ SMESH_MeshEditor::ExtrusionAlongTrack (TIDSortedElemSet theElements[2], if ( nbEdges > 0 ) break; } + // fall through default: { for ( int di = -1; di <= 1; di += 2 ) @@ -7460,6 +7461,7 @@ public: //int& GroupID() const { return const_cast< int& >( myGroupID ); } ComparableElement( const ComparableElement& theSource ) // move copy + : boost::container::flat_set< int >() { ComparableElement& src = const_cast< ComparableElement& >( theSource ); (int_set&) (*this ) = boost::move( src ); @@ -9216,7 +9218,7 @@ void SMESH_MeshEditor::ConvertToQuadratic(const bool theForce3d, int SMESH_MeshEditor::removeQuadElem(SMESHDS_SubMesh * theSm, SMDS_ElemIteratorPtr theItr, - const int theShapeID) + const int /*theShapeID*/) { int nbElem = 0; SMESHDS_Mesh* meshDS = GetMeshDS(); @@ -10198,7 +10200,7 @@ namespace // automatically find theAffectedElems for DoubleNodes() if ( SMESH_MeshAlgos::FaceNormal( _elems[1], norm )) avgNorm += norm; - gp_XYZ bordDir( SMESH_NodeXYZ( _nodes[0] ) - SMESH_NodeXYZ( _nodes[1] )); + gp_XYZ bordDir( SMESH_NodeXYZ( _nodes[0] ) - SMESH_NodeXYZ( _nodes[1] )); // todo: compiler complains about zero-size array norm = bordDir ^ avgNorm; } else @@ -11045,7 +11047,7 @@ double SMESH_MeshEditor::OrientedAngle(const gp_Pnt& p0, const gp_Pnt& p1, const try { return n2.AngleWithRef(n1, vref); } - catch ( Standard_Failure ) { + catch ( Standard_Failure& ) { } return Max( v1.Magnitude(), v2.Magnitude() ); } diff --git a/src/SMESH/SMESH_MesherHelper.cxx b/src/SMESH/SMESH_MesherHelper.cxx index 17c9d9047..9c99e17b6 100644 --- a/src/SMESH/SMESH_MesherHelper.cxx +++ b/src/SMESH/SMESH_MesherHelper.cxx @@ -2421,7 +2421,7 @@ SMDS_MeshVolume* SMESH_MesherHelper::AddVolume(const SMDS_MeshNode* n1, const SMDS_MeshNode* n11, const SMDS_MeshNode* n12, const int id, - bool force3d) + bool /*force3d*/) { SMESHDS_Mesh * meshDS = GetMeshDS(); SMDS_MeshVolume* elem = 0; @@ -3769,7 +3769,7 @@ namespace { // Structures used by FixQuadraticElements() /*! * \brief Dump QLink and QFace */ - ostream& operator << (ostream& out, const QLink& l) + ostream& operator << (ostream& out, const QLink& l) // todo: unused in release mode { out <<"QLink nodes: " << l.node1()->GetID() << " - " @@ -3777,7 +3777,7 @@ namespace { // Structures used by FixQuadraticElements() << l.node2()->GetID() << endl; return out; } - ostream& operator << (ostream& out, const QFace& f) + ostream& operator << (ostream& out, const QFace& f) // todo: unused in release mode { out <<"QFace nodes: "/*<< &f << " "*/; for ( TIDSortedNodeSet::const_iterator n = f.begin(); n != f.end(); ++n ) @@ -3820,6 +3820,7 @@ namespace { // Structures used by FixQuadraticElements() #ifdef _DEBUG_ _face = face; #endif + (void)face; // unused in release mode } //================================================================================ /*! @@ -4130,7 +4131,7 @@ namespace { // Structures used by FixQuadraticElements() */ //================================================================================ - bool QFace::IsSpoiled(const QLink* bentLink ) const + bool QFace::IsSpoiled(const QLink* bentLink ) const // todo: unused { // code is valid for convex faces only gp_XYZ gc(0,0,0); @@ -4613,7 +4614,7 @@ namespace { // Structures used by FixQuadraticElements() if ( curvNorm * D2 > 0 ) continue; // convex edge } - catch ( Standard_Failure ) + catch ( Standard_Failure& ) { continue; } @@ -4728,7 +4729,7 @@ namespace { // Structures used by FixQuadraticElements() if ( concaveU || concaveV ) concaveFaces.push_back( face ); } - catch ( Standard_Failure ) + catch ( Standard_Failure& ) { concaveFaces.push_back( face ); } @@ -5260,7 +5261,7 @@ void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& compError, try { gp_Vec x = x01.Normalized() + x12.Normalized(); trsf.SetTransformation( gp_Ax3( gp::Origin(), link1->Normal(), x), gp_Ax3() ); - } catch ( Standard_Failure ) { + } catch ( Standard_Failure& ) { trsf.Invert(); } move.Transform(trsf); diff --git a/src/SMESH/SMESH_Pattern.cxx b/src/SMESH/SMESH_Pattern.cxx index 453a4c06b..a6e36e0d7 100644 --- a/src/SMESH/SMESH_Pattern.cxx +++ b/src/SMESH/SMESH_Pattern.cxx @@ -177,7 +177,7 @@ int readLine (list & theFields, case '-': // real number case '+': case '.': - isNumber = true; + isNumber = true; // fall through default: // data isNumber = isNumber || ( *theLineBeg >= '0' && *theLineBeg <= '9' ); if ( isNumber ) { @@ -4289,11 +4289,13 @@ void SMESH_Pattern::createElements(SMESH_Mesh* theMes elem = aMeshDS->AddFace (nodes[0], nodes[1], nodes[2], nodes[3], nodes[4], nodes[5] ); break; } // else do not break but create a polygon + // fall through case 8: if ( !onMeshElements ) {// create a quadratic face elem = aMeshDS->AddFace (nodes[0], nodes[1], nodes[2], nodes[3], nodes[4], nodes[5], nodes[6], nodes[7] ); break; } // else do not break but create a polygon + // fall through default: elem = aMeshDS->AddPolygonalFace( nodes ); } diff --git a/src/SMESH/SMESH_ProxyMesh.hxx b/src/SMESH/SMESH_ProxyMesh.hxx index 35480adaf..fc2e9b201 100644 --- a/src/SMESH/SMESH_ProxyMesh.hxx +++ b/src/SMESH/SMESH_ProxyMesh.hxx @@ -92,7 +92,7 @@ public: protected: // methods of SMDS_ElementHolder; remove elements before mesh compacting or clearing virtual SMDS_ElemIteratorPtr getElements() { Clear(); return GetElements(); } virtual void tmpClear() {} - virtual void add( const SMDS_MeshElement* element ) {} + virtual void add( const SMDS_MeshElement* /*element*/ ) {} virtual void compact() {} virtual void clear() { Clear(); } }; diff --git a/src/SMESH/SMESH_subMesh.cxx b/src/SMESH/SMESH_subMesh.cxx index 4f9955cf3..eed10525b 100644 --- a/src/SMESH/SMESH_subMesh.cxx +++ b/src/SMESH/SMESH_subMesh.cxx @@ -1445,6 +1445,7 @@ bool SMESH_subMesh::ComputeStateEngine(compute_event event) loadDependentMeshes(); ComputeSubMeshStateEngine( SUBMESH_LOADED ); //break; + // fall through case CHECK_COMPUTE_STATE: if ( IsMeshComputed() ) _computeState = COMPUTE_OK; @@ -1496,6 +1497,7 @@ bool SMESH_subMesh::ComputeStateEngine(compute_event event) } break; } + // fall through case COMPUTE: case COMPUTE_SUBMESH: { @@ -1763,6 +1765,7 @@ bool SMESH_subMesh::ComputeStateEngine(compute_event event) loadDependentMeshes(); ComputeSubMeshStateEngine( SUBMESH_LOADED ); //break; + // fall through case CHECK_COMPUTE_STATE: if ( IsMeshComputed() ) _computeState = COMPUTE_OK; @@ -2149,7 +2152,7 @@ void SMESH_subMesh::removeSubMeshElementsAndNodes() // meshed at once along with _subShape //======================================================================= -TopoDS_Shape SMESH_subMesh::getCollection(SMESH_Gen * theGen, +TopoDS_Shape SMESH_subMesh::getCollection(SMESH_Gen * /*theGen*/, SMESH_Algo* theAlgo, bool & theSubComputed, bool & theSubFailed, diff --git a/src/SMESH/SMESH_subMeshEventListener.hxx b/src/SMESH/SMESH_subMeshEventListener.hxx index dddc54d1a..d30fc8bdf 100644 --- a/src/SMESH/SMESH_subMeshEventListener.hxx +++ b/src/SMESH/SMESH_subMeshEventListener.hxx @@ -55,8 +55,8 @@ class SMESH_EXPORT SMESH_subMeshEventListener virtual ~SMESH_subMeshEventListener() {} bool IsDeletable() const { return myIsDeletable; } const char* GetName() const { return myName; } - virtual void BeforeDelete(SMESH_subMesh* subMesh, - SMESH_subMeshEventListenerData* data) + virtual void BeforeDelete(SMESH_subMesh* /*subMesh*/, + SMESH_subMeshEventListenerData* /*data*/) {} /*! * \brief Do something on a certain event diff --git a/src/SMESHClient/SMESH_Client.cxx b/src/SMESHClient/SMESH_Client.cxx index 72b9adaf8..8526c0668 100644 --- a/src/SMESHClient/SMESH_Client.cxx +++ b/src/SMESHClient/SMESH_Client.cxx @@ -745,9 +745,9 @@ namespace //======================================================================= //function : ChangePolyhedronNodes //======================================================================= - inline void ChangePolyhedronNodes (SMDS_Mesh* theMesh, - SMESH::log_array_var& theSeq, - CORBA::Long theId) + inline void ChangePolyhedronNodes (SMDS_Mesh* /*theMesh*/, + SMESH::log_array_var& /*theSeq*/, + CORBA::Long /*theId*/) { // const SMESH::long_array& anIndexes = theSeq[theId].indexes; // CORBA::Long iind = 0, aNbElems = theSeq[theId].number; diff --git a/src/SMESHDS/SMESHDS_Mesh.cxx b/src/SMESHDS/SMESHDS_Mesh.cxx index fa3b0ec9a..e7429e5a2 100644 --- a/src/SMESHDS/SMESHDS_Mesh.cxx +++ b/src/SMESHDS/SMESHDS_Mesh.cxx @@ -273,7 +273,7 @@ bool SMESHDS_Mesh //purpose : //======================================================================= -void SMESHDS_Mesh::Renumber (const bool isNodes, const int startID, const int deltaID) +void SMESHDS_Mesh::Renumber (const bool /*isNodes*/, const int /*startID*/, const int /*deltaID*/) { // TODO not possible yet to have node numbers not starting to O and continuous. if ( !this->IsCompacted() ) @@ -838,7 +838,7 @@ SMDS_MeshVolume* SMESHDS_Mesh::AddPolyhedralVolume //purpose : //======================================================================= -static void removeFromContainers (SMESHDS_Mesh* theMesh, +static void removeFromContainers (SMESHDS_Mesh* /*theMesh*/, std::set& theGroups, std::vector& theElems) { diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index 6ed14a435..c0f40b875 100644 --- a/src/SMESHGUI/SMESHGUI.cxx +++ b/src/SMESHGUI/SMESHGUI.cxx @@ -2760,7 +2760,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) OCC_CATCH_SIGNALS; SMESH::UpdateView(); } - catch (std::bad_alloc) { // PAL16774 (Crash after display of many groups) + catch (std::bad_alloc&) { // PAL16774 (Crash after display of many groups) SMESH::OnVisuException(); } catch (...) { // PAL16774 (Crash after display of many groups) @@ -2865,7 +2865,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) case SMESHOp::OpCreateSubMesh: if ( warnOnGeomModif() ) break; // action forbiden as geometry modified - + // fall through case SMESHOp::OpCreateMesh: case SMESHOp::OpCompute: case SMESHOp::OpComputeSubMesh: @@ -3977,7 +3977,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) * */ //============================================================================= -bool SMESHGUI::OnMousePress( QMouseEvent * pe, SUIT_ViewWindow * wnd ) +bool SMESHGUI::OnMousePress( QMouseEvent * /*pe*/, SUIT_ViewWindow * /*wnd*/ ) { return false; } @@ -3987,7 +3987,7 @@ bool SMESHGUI::OnMousePress( QMouseEvent * pe, SUIT_ViewWindow * wnd ) * */ //============================================================================= -bool SMESHGUI::OnMouseMove( QMouseEvent * pe, SUIT_ViewWindow * wnd ) +bool SMESHGUI::OnMouseMove( QMouseEvent * /*pe*/, SUIT_ViewWindow * /*wnd*/ ) { return true; } @@ -3997,7 +3997,7 @@ bool SMESHGUI::OnMouseMove( QMouseEvent * pe, SUIT_ViewWindow * wnd ) * */ //============================================================================= -bool SMESHGUI::OnKeyPress( QKeyEvent * pe, SUIT_ViewWindow * wnd ) +bool SMESHGUI::OnKeyPress( QKeyEvent * /*pe*/, SUIT_ViewWindow * /*wnd*/ ) { return true; } @@ -5332,7 +5332,7 @@ void SMESHGUI::addActorAsObserver( SMESH_Actor* theActor ) void SMESHGUI::ProcessEvents( vtkObject* theObject, unsigned long theEvent, void* theClientData, - void* theCallData ) + void* /*theCallData*/ ) { if( SMESHGUI* aSMESHGUI = reinterpret_cast( theClientData ) ) { if( theObject && (int) theEvent == SMESH::DeleteActorEvent ) { diff --git a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx index 5a51a1a63..cc158fb1d 100644 --- a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx @@ -1274,7 +1274,7 @@ void SMESHGUI_AddQuadraticElementDlg::enterEvent (QEvent*) // purpose : //================================================================================= -void SMESHGUI_AddQuadraticElementDlg::onReverse (int state) +void SMESHGUI_AddQuadraticElementDlg::onReverse (int /*state*/) { mySimulation->SetVisibility(false); displaySimulation(); @@ -1449,7 +1449,7 @@ void SMESHGUI_AddQuadraticElementDlg::UpdateTable( bool theConersValidity ) // purpose : //================================================================================= -void SMESHGUI_AddQuadraticElementDlg::onCellDoubleClicked( int theRow, int theCol ) +void SMESHGUI_AddQuadraticElementDlg::onCellDoubleClicked( int /*theRow*/, int /*theCol*/ ) { myCurrentLineEdit = 0; displaySimulation(); @@ -1461,7 +1461,7 @@ void SMESHGUI_AddQuadraticElementDlg::onCellDoubleClicked( int theRow, int theCo // purpose : //================================================================================= -void SMESHGUI_AddQuadraticElementDlg::onCellTextChange(int theRow, int theCol) +void SMESHGUI_AddQuadraticElementDlg::onCellTextChange(int /*theRow*/, int /*theCol*/) { myCurrentLineEdit = 0; displaySimulation(); diff --git a/src/SMESHGUI/SMESHGUI_ClippingDlg.h b/src/SMESHGUI/SMESHGUI_ClippingDlg.h index 3184c90ee..592409d27 100644 --- a/src/SMESHGUI/SMESHGUI_ClippingDlg.h +++ b/src/SMESHGUI/SMESHGUI_ClippingDlg.h @@ -81,7 +81,7 @@ namespace SMESH public: static OrientedPlane *New(); static OrientedPlane *New(SVTK_ViewWindow* theViewWindow); - vtkTypeMacro (OrientedPlane, vtkPlane); + vtkTypeMacro (OrientedPlane, vtkPlane) QPointer myViewWindow; SMESH::Orientation myRelativeOrientation; @@ -135,7 +135,7 @@ namespace SMESH typedef std::vector TPlaneVector; typedef std::vector TPlaneDataVector; -}; +} //================================================================================= // class : SMESHGUI_ClippingDlg diff --git a/src/SMESHGUI/SMESHGUI_FieldSelectorWdg.cxx b/src/SMESHGUI/SMESHGUI_FieldSelectorWdg.cxx index ef2402872..598665a6e 100644 --- a/src/SMESHGUI/SMESHGUI_FieldSelectorWdg.cxx +++ b/src/SMESHGUI/SMESHGUI_FieldSelectorWdg.cxx @@ -214,7 +214,7 @@ bool SMESHGUI_FieldSelectorWdg::GetSelectedFields() /*! * \brief SLOT called when a tree item is checked */ -void SMESHGUI_FieldSelectorWdg::onItemCheck(QTreeWidgetItem * item, int column) +void SMESHGUI_FieldSelectorWdg::onItemCheck(QTreeWidgetItem * item, int /*column*/) { myTree->blockSignals( true ); if ( !item->parent() ) // mesh item diff --git a/src/SMESHGUI/SMESHGUI_Filter.h b/src/SMESHGUI/SMESHGUI_Filter.h index b8579a199..1a9ef3143 100644 --- a/src/SMESHGUI/SMESHGUI_Filter.h +++ b/src/SMESHGUI/SMESHGUI_Filter.h @@ -55,7 +55,7 @@ namespace SMESH FirstEntityTypeFilter = FirstGeometryTypeFilter + SMDSGeom_NONE, LastFilter = FirstEntityTypeFilter + SMDSEntity_Last }; -}; +} /* Class : SMESHGUI_Filter diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx index 5d7f16093..913f25231 100644 --- a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx @@ -697,7 +697,7 @@ void SMESHGUI_FilterTable::ComboDelegate::setModelData( QWidget* editor, void SMESHGUI_FilterTable::ComboDelegate::updateEditorGeometry( QWidget* editor, const QStyleOptionViewItem& option, - const QModelIndex& index ) const + const QModelIndex& /*index*/ ) const { editor->setGeometry( option.rect ); } @@ -1732,6 +1732,7 @@ static QList entityTypes( const int theType ) { case SMESH::NODE: typeIds.append( SMDSEntity_Node ); + break; case SMESH::EDGE: typeIds.append( SMDSEntity_Edge ); typeIds.append( SMDSEntity_Quad_Edge ); @@ -1776,7 +1777,7 @@ static QList entityTypes( const int theType ) // Purpose : Provides reaction on change of criterion //======================================================================= -void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, const int entityType) +void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int /*col*/, const int entityType) { int aType = entityType == -1 ? GetType() : entityType; Table* aTable = myTables[ aType ]; @@ -2377,7 +2378,7 @@ const QMap& SMESHGUI_FilterTable::getCompare() const // Purpose : Create table //======================================================================= SMESHGUI_FilterTable::Table* SMESHGUI_FilterTable::createTable (QWidget* theParent, - const int theType) + const int /*theType*/) { // create table Table* aTable= new Table(0, 6, theParent); @@ -3816,6 +3817,7 @@ void SMESHGUI_FilterDlg::onSelectionDone() myTable->SetThreshold(aRow, SMESH::toQStr( grp->GetName() )); myTable->SetID (aRow, anIO->getEntry() ); } + break; } default: // get a GEOM object { diff --git a/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx b/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx index d51b928c3..4c88cce9b 100644 --- a/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx @@ -1152,7 +1152,7 @@ const SMESHGUI_FilterTable* SMESHGUI_FilterLibraryDlg::GetTable() const // name : SMESHGUI_FilterLibraryDlg::onEntityTypeChanged // Purpose : SLOT. Called when entiyt type changed //======================================================================= -void SMESHGUI_FilterLibraryDlg::onEntityTypeChanged(const int theType) +void SMESHGUI_FilterLibraryDlg::onEntityTypeChanged(const int /*theType*/) { if (myLibrary->_is_nil()) return; @@ -1244,6 +1244,7 @@ void SMESHGUI_FilterLibraryDlg::onSelectionDone() case SMESH::FT_BelongToMeshGroup: // get a group name and IOR { myTable->SetThreshold(aRow, anIO->getName() ); + break; } default: // get a GEOM object { diff --git a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx index 337f4d20f..b366ff6f3 100644 --- a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx @@ -46,7 +46,7 @@ namespace SMESH { GEOM::GEOM_Gen_var GetGEOMGen( GEOM::GEOM_Object_ptr go ) { - GEOM::GEOM_Gen_ptr gen; + GEOM::GEOM_Gen_ptr gen = GEOM::GEOM_Gen::_nil(); if ( !CORBA::is_nil( go )) gen = go->GetGen(); return gen; diff --git a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx index 2313c768c..d3438261a 100644 --- a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx @@ -767,7 +767,7 @@ void SMESHGUI_GroupDlg::updateButtons() // function : onNameChanged() // purpose : //================================================================================= -void SMESHGUI_GroupDlg::onNameChanged (const QString& text) +void SMESHGUI_GroupDlg::onNameChanged (const QString& /*text*/) { myOldName = myName->text(); updateButtons(); @@ -814,7 +814,7 @@ void SMESHGUI_GroupDlg::onGrpTypeChanged (int id) // function : onColorChanged() // purpose : Color button management //================================================================================= -void SMESHGUI_GroupDlg::onColorChanged(QColor theColor) +void SMESHGUI_GroupDlg::onColorChanged(QColor /*theColor*/) { updateButtons(); } diff --git a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx index 9c6782979..251bcc78c 100644 --- a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx @@ -592,7 +592,7 @@ namespace SMESH SMESH::SMESH_Hypothesis_ptr CreateHypothesis(const QString& aHypType, const QString& aHypName, - const bool isAlgo) + const bool /*isAlgo*/) { if(MYDEBUG) MESSAGE("Create " << aHypType.toLatin1().data() << " with name " << aHypName.toLatin1().data()); diff --git a/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx b/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx index 69cf9cc61..ceff2a4d2 100644 --- a/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx +++ b/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx @@ -316,7 +316,7 @@ void SMESHGUI_Make2DFrom3DOp::selectionDone() } } -SUIT_SelectionFilter* SMESHGUI_Make2DFrom3DOp::createFilter( const int theId ) const +SUIT_SelectionFilter* SMESHGUI_Make2DFrom3DOp::createFilter( const int /*theId*/ ) const { SMESHGUI_Make2DFrom3DOp* me = (SMESHGUI_Make2DFrom3DOp*) this; diff --git a/src/SMESHGUI/SMESHGUI_Measurements.h b/src/SMESHGUI/SMESHGUI_Measurements.h index 83ee72ea3..66ecc6e0c 100644 --- a/src/SMESHGUI/SMESHGUI_Measurements.h +++ b/src/SMESHGUI/SMESHGUI_Measurements.h @@ -46,7 +46,7 @@ class SMESHGUI_MeshEditPreview; class SMESHGUI_EXPORT SMESHGUI_MinDistance : public QWidget { - Q_OBJECT; + Q_OBJECT enum { NoTgt, FirstTgt, SecondTgt }; enum { OriginTgt, NodeTgt, ElementTgt, ObjectTgt }; @@ -95,7 +95,7 @@ private: class SMESHGUI_EXPORT SMESHGUI_BoundingBox : public QWidget { - Q_OBJECT; + Q_OBJECT enum { ObjectsSrc, NodesSrc, ElementsSrc }; @@ -141,7 +141,7 @@ private: class SMESHGUI_EXPORT SMESHGUI_BasicProperties : public QWidget { - Q_OBJECT; + Q_OBJECT public: //! Property type @@ -172,7 +172,7 @@ private: class SMESHGUI_EXPORT SMESHGUI_Angle : public QWidget { - Q_OBJECT; + Q_OBJECT public: @@ -206,7 +206,7 @@ private: class SMESHGUI_EXPORT SMESHGUI_MeasureDlg : public QDialog { - Q_OBJECT; + Q_OBJECT enum { NodeMode, ElemMode }; diff --git a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx index f5d5a0e7f..63d4b9d30 100644 --- a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx @@ -1621,7 +1621,7 @@ void SMESHGUI_MergeDlg::onSelectKeep() // IDs to groups or vice versa //======================================================================= -void SMESHGUI_MergeDlg::onKeepSourceChanged(int isGroup) +void SMESHGUI_MergeDlg::onKeepSourceChanged(int /*isGroup*/) { KeepList->clear(); SelectKeepButton->click(); diff --git a/src/SMESHGUI/SMESHGUI_MergeDlg.h b/src/SMESHGUI/SMESHGUI_MergeDlg.h index 684629c34..5cecfd2f6 100644 --- a/src/SMESHGUI/SMESHGUI_MergeDlg.h +++ b/src/SMESHGUI/SMESHGUI_MergeDlg.h @@ -72,7 +72,7 @@ namespace SMESH //================================================================================= class SMESHGUI_EXPORT SMESHGUI_MergeDlg : public QDialog { - Q_OBJECT; + Q_OBJECT public: SMESHGUI_MergeDlg( SMESHGUI*, int ); diff --git a/src/SMESHGUI/SMESHGUI_MeshInfo.cxx b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx index e6d9c8e7a..66db3c27f 100644 --- a/src/SMESHGUI/SMESHGUI_MeshInfo.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx @@ -1804,8 +1804,8 @@ void SMESHGUI_ElemInfo::writeInfo( InfoWriter* writer, const QList& ids ) writer->write( SMESHGUI_AddInfo::tr( "TYPE" ), SMESHGUI_AddInfo::tr( "GROUP_ON_FILTER" ) ); } int size = group.size(); - if ( size != -1 ); - writer->write( SMESHGUI_AddInfo::tr( "SIZE" ), size ); + if ( size != -1 ) + writer->write( SMESHGUI_AddInfo::tr( "SIZE" ), size ); QColor color = group.color(); if ( color.isValid() ) writer->write( SMESHGUI_AddInfo::tr( "COLOR" ), color.name() ); @@ -1935,7 +1935,7 @@ void SMESHGUI_ElemInfo::writeInfo( InfoWriter* writer, const QList& ids ) writer->write( SMESHGUI_AddInfo::tr( "TYPE" ), SMESHGUI_AddInfo::tr( "GROUP_ON_FILTER" ) ); } int size = group.size(); - if ( size != -1 ); + if ( size != -1 ) writer->write( SMESHGUI_AddInfo::tr( "SIZE" ), size ); QColor color = group.color(); if ( color.isValid() ) @@ -2175,8 +2175,8 @@ void SMESHGUI_TreeElemInfo::information( const QList& ids ) \param nbNodes number of unique nodes in element \param parentItem parent item of tree */ -void SMESHGUI_TreeElemInfo::nodeInfo( const SMDS_MeshNode* node, int index, - int nbNodes, QTreeWidgetItem* parentItem ) +void SMESHGUI_TreeElemInfo::nodeInfo( const SMDS_MeshNode* /*node*/, int /*index*/, + int /*nbNodes*/, QTreeWidgetItem* /*parentItem*/ ) { // int precision = SMESHGUI::resourceMgr()->integerValue( "SMESH", "length_precision", 6 ); // // node number and ID @@ -2284,7 +2284,7 @@ void SMESHGUI_TreeElemInfo::contextMenuEvent( QContextMenuEvent* e ) } } -void SMESHGUI_TreeElemInfo::itemDoubleClicked( QTreeWidgetItem* theItem, int theColumn ) +void SMESHGUI_TreeElemInfo::itemDoubleClicked( QTreeWidgetItem* theItem, int /*theColumn*/ ) { if ( theItem ) { int type = theItem->data( 1, TypeRole ).toInt(); diff --git a/src/SMESHGUI/SMESHGUI_MeshInfo.h b/src/SMESHGUI/SMESHGUI_MeshInfo.h index e01d5af26..1358a65ed 100644 --- a/src/SMESHGUI/SMESHGUI_MeshInfo.h +++ b/src/SMESHGUI/SMESHGUI_MeshInfo.h @@ -71,7 +71,7 @@ public: class SMESHGUI_EXPORT SMESHGUI_BaseInfo : public SMESHGUI_Info { - Q_OBJECT; + Q_OBJECT enum { @@ -158,7 +158,7 @@ private: class SMESHGUI_EXPORT SMESHGUI_ElemInfo : public SMESHGUI_Info { - Q_OBJECT; + Q_OBJECT public: SMESHGUI_ElemInfo( QWidget* = 0 ); @@ -205,7 +205,7 @@ private: class SMESHGUI_EXPORT SMESHGUI_SimpleElemInfo : public SMESHGUI_ElemInfo { - Q_OBJECT; + Q_OBJECT public: SMESHGUI_SimpleElemInfo( QWidget* = 0 ); @@ -223,7 +223,7 @@ private slots: class SMESHGUI_EXPORT SMESHGUI_TreeElemInfo : public SMESHGUI_ElemInfo { - Q_OBJECT; + Q_OBJECT class ItemDelegate; class ItemCreator; @@ -251,7 +251,7 @@ private: class InfoComputor: public QObject { - Q_OBJECT; + Q_OBJECT public: enum { GrpSize, GrpNbNodes }; @@ -271,7 +271,7 @@ private: class SMESHGUI_EXPORT SMESHGUI_AddInfo : public SMESHGUI_Info { - Q_OBJECT; + Q_OBJECT public: SMESHGUI_AddInfo( QWidget* = 0 ); @@ -307,7 +307,7 @@ private: class SMESHGUI_EXPORT SMESHGUI_CtrlInfo : public SMESHGUI_Info { - Q_OBJECT; + Q_OBJECT public: SMESHGUI_CtrlInfo( QWidget* = 0 ); @@ -354,7 +354,7 @@ private: class SMESHGUI_EXPORT SMESHGUI_MeshInfoDlg : public QDialog { - Q_OBJECT; + Q_OBJECT enum { NodeMode, ElemMode, GroupMode }; @@ -409,7 +409,7 @@ private: class SMESHGUI_EXPORT SMESHGUI_CtrlInfoDlg : public QDialog { - Q_OBJECT; + Q_OBJECT public: SMESHGUI_CtrlInfoDlg( QWidget* = 0 ); diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx index f143b0136..10366f210 100644 --- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx @@ -882,7 +882,7 @@ void SMESHGUI_MeshOp::availableHyps( const int theDim, THypDataList& theDataList, HypothesisData* thePrevAlgoData, HypothesisData* theNextAlgoData, - const QString& theMeshType) + const QString& /*theMeshType*/) { theDataList.clear(); theHyps.clear(); @@ -1434,7 +1434,7 @@ void SMESHGUI_MeshOp::onEditHyp( const int theHypType, const int theIndex ) * 1 = accepted */ //================================================================================ -void SMESHGUI_MeshOp::onHypoEdited( int result ) +void SMESHGUI_MeshOp::onHypoEdited( int /*result*/ ) { int obj = myDlg->getActiveObject(); onActivateObject( obj ); // Issue 0020170. Restore filters @@ -2975,7 +2975,7 @@ void SMESHGUI_MeshOp::updateHypoSets() * \param theIndex - Index of current type of mesh */ //================================================================================ -void SMESHGUI_MeshOp::onAlgoSetByMeshType( const int theTabIndex, const int theIndex ) +void SMESHGUI_MeshOp::onAlgoSetByMeshType( const int /*theTabIndex*/, const int /*theIndex*/ ) { setFilteredAlgoData(); } diff --git a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx index cf0bde0fd..d6ff130e1 100644 --- a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx @@ -369,7 +369,6 @@ SMESH::NumericalFunctor_ptr SMESHGUI_MultiEditDlg::getNumericalFunctor() aNF = aFilterMgr->CreateMultiConnection2D(); else if (myComboBoxFunctor->currentText() == tr("MIN_DIAG_ELEMENTS")) aNF = aFilterMgr->CreateMaxElementLength2D(); - else; return aNF._retn(); } diff --git a/src/SMESHGUI/SMESHGUI_NodesDlg.cxx b/src/SMESHGUI/SMESHGUI_NodesDlg.cxx index 1bd22a3e6..fe21898a1 100644 --- a/src/SMESHGUI/SMESHGUI_NodesDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_NodesDlg.cxx @@ -395,7 +395,7 @@ void SMESHGUI_NodesDlg::Init() // function : ValueChangedInSpinBox() // purpose : //================================================================================= -void SMESHGUI_NodesDlg::ValueChangedInSpinBox( double newValue ) +void SMESHGUI_NodesDlg::ValueChangedInSpinBox( double /*newValue*/ ) { if ( !myMesh->_is_nil() ) { double vx = SpinBox_X->GetValue(); diff --git a/src/SMESHGUI/SMESHGUI_PreVisualObj.cxx b/src/SMESHGUI/SMESHGUI_PreVisualObj.cxx index 209a52f64..6f329dd13 100644 --- a/src/SMESHGUI/SMESHGUI_PreVisualObj.cxx +++ b/src/SMESHGUI/SMESHGUI_PreVisualObj.cxx @@ -35,7 +35,7 @@ SMDS_Mesh* SMESHGUI_PreVisualObj::GetMesh() const return myMesh; } -bool SMESHGUI_PreVisualObj::Update( int theIsClear = true ) +bool SMESHGUI_PreVisualObj::Update( int /*theIsClear*/) { return false; } diff --git a/src/SMESHGUI/SMESHGUI_PreviewDlg.cxx b/src/SMESHGUI/SMESHGUI_PreviewDlg.cxx index 1ddbcf8ec..96d2e4c7c 100644 --- a/src/SMESHGUI/SMESHGUI_PreviewDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_PreviewDlg.cxx @@ -101,7 +101,7 @@ void SMESHGUI_PreviewDlg::toDisplaySimulation() { // function : onDisplaySimulation // purpose : //================================================================================= -void SMESHGUI_PreviewDlg::onDisplaySimulation(bool toDisplayPreview) { +void SMESHGUI_PreviewDlg::onDisplaySimulation(bool /*toDisplayPreview*/) { //Empty implementation here } @@ -212,7 +212,7 @@ void SMESHGUI_MultiPreviewDlg::toDisplaySimulation() // function : onDisplaySimulation // purpose : //================================================================================= -void SMESHGUI_MultiPreviewDlg::onDisplaySimulation( bool toDisplayPreview ) +void SMESHGUI_MultiPreviewDlg::onDisplaySimulation( bool /*toDisplayPreview*/ ) { //Empty implementation here } diff --git a/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx b/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx index fbed2f350..876bee262 100644 --- a/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx @@ -385,7 +385,7 @@ void SMESHGUI_RenumberingDlg::ActivateThisDialog() // function : enterEvent() // purpose : //================================================================================= -void SMESHGUI_RenumberingDlg::enterEvent(QEvent* e) +void SMESHGUI_RenumberingDlg::enterEvent(QEvent* /*e*/) { if (GroupConstructors->isEnabled()) return; diff --git a/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx b/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx index b54dbfbe4..b9b21708f 100644 --- a/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx @@ -573,7 +573,7 @@ void SMESHGUI_RevolutionDlg::ClickOnHelp() // function : onAngleTextChange() // purpose : //======================================================================= -void SMESHGUI_RevolutionDlg::onAngleTextChange (const QString& theNewText) +void SMESHGUI_RevolutionDlg::onAngleTextChange (const QString& /*theNewText*/) { bool isNumber; SpinBox_Angle->text().toDouble( &isNumber ); diff --git a/src/SMESHGUI/SMESHGUI_SelectionOp.cxx b/src/SMESHGUI/SMESHGUI_SelectionOp.cxx index 562871ff5..c84dd447e 100644 --- a/src/SMESHGUI/SMESHGUI_SelectionOp.cxx +++ b/src/SMESHGUI/SMESHGUI_SelectionOp.cxx @@ -195,7 +195,7 @@ void SMESHGUI_SelectionOp::onActivateObject( int id ) // name : onDeactivateObject // purpose : //================================================================================= -void SMESHGUI_SelectionOp::onDeactivateObject( int id ) +void SMESHGUI_SelectionOp::onDeactivateObject( int /*id*/ ) { removeCustomFilters(); } diff --git a/src/SMESHGUI/SMESHGUI_SewingDlg.cxx b/src/SMESHGUI/SMESHGUI_SewingDlg.cxx index a1ba78b12..ca6c7293b 100644 --- a/src/SMESHGUI/SMESHGUI_SewingDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_SewingDlg.cxx @@ -1243,16 +1243,16 @@ void SMESHGUI_SewingDlg::onMoveBorderEnd(int button) { aPRT.node1 = ( aPRT.node1 + size + dn ) % size; aPRT.node2 = ( aPRT.node2 + size + dn ) % size; - break; } + break; case MOVE_LEFT_2: case MOVE_RIGHT_2: if (( isClosed ) || ( 0 <= aPRT.nodeLast+dn && aPRT.nodeLast+dn < size )) { aPRT.nodeLast = ( aPRT.nodeLast + size + dn ) % size; - break; } + break; default: return; // impossible to move } @@ -1584,8 +1584,8 @@ void SMESHGUI_SewingDlg::onTextChange (const QString& theNewText) if (e) newIndices.Add(e->GetID()); - if (!isEvenOneExists) - isEvenOneExists = true; + if (!isEvenOneExists) + isEvenOneExists = true; } mySelector->AddOrRemoveIndex(myActor->getIO(), newIndices, false); @@ -1798,7 +1798,7 @@ void SMESHGUI_SewingDlg::ActivateThisDialog() // function : enterEvent() // purpose : //================================================================================= -void SMESHGUI_SewingDlg::enterEvent (QEvent* e) +void SMESHGUI_SewingDlg::enterEvent (QEvent* /*e*/) { if (!ConstructorsBox->isEnabled()) { SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ); diff --git a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx index 223001a44..f761912cc 100644 --- a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx @@ -469,7 +469,7 @@ void SMESHGUI_ShapeByMeshOp::activateSelection() //purpose : SLOT. Called when element type changed. //======================================================================= -void SMESHGUI_ShapeByMeshOp::onTypeChanged (int theType) +void SMESHGUI_ShapeByMeshOp::onTypeChanged (int /*theType*/) { setElementID(""); activateSelection(); diff --git a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx index 5f2f3ab5b..ee532a7e0 100644 --- a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx @@ -172,7 +172,7 @@ QWidget* SMESHGUI_SingleEditDlg::createButtonFrame (QWidget* theParent) // name : isValid() // Purpose : Verify validity of input data //======================================================================= -bool SMESHGUI_SingleEditDlg::isValid (const bool theMess) const +bool SMESHGUI_SingleEditDlg::isValid (const bool /*theMess*/) const { int id1, id2; return getNodeIds(myEdge->text(), id1, id2); @@ -333,7 +333,7 @@ static bool findTriangles (const SMDS_MeshNode * theNode1, //function : onTextChange() //purpose : //======================================================================= -void SMESHGUI_SingleEditDlg::onTextChange (const QString& theNewText) +void SMESHGUI_SingleEditDlg::onTextChange (const QString& /*theNewText*/) { if (myBusy) return; BusyLocker lock(myBusy); diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx index f1ca735ab..39966b6d6 100644 --- a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx @@ -794,6 +794,7 @@ namespace SMESH } aStudy->setVisibilityStateForAll(Qtx::HiddenState); } + // fall through default: { if (SMESH_Actor *anActor = FindActorByEntry(theWnd,theEntry)) { switch (theAction) { @@ -1326,7 +1327,7 @@ namespace SMESH int GetSelected(LightApp_SelectionMgr* theMgr, TColStd_IndexedMapOfInteger& theMap, - const bool theIsElement) + const bool /*theIsElement*/) { theMap.Clear(); SALOME_ListIO selected; theMgr->selectedObjects( selected ); diff --git a/src/SMESHUtils/SMESH_Block.cxx b/src/SMESHUtils/SMESH_Block.cxx index 92fc3b319..2cc0695a7 100644 --- a/src/SMESHUtils/SMESH_Block.cxx +++ b/src/SMESHUtils/SMESH_Block.cxx @@ -1142,7 +1142,7 @@ bool SMESH_Block::findUVByHalfDivision( const gp_Pnt& thePoint, //================================================================================ bool SMESH_Block::findUVAround( const gp_Pnt& thePoint, - const gp_XY& theUV, + const gp_XY& /*theUV*/, const SMESH_Block::TFace& tface, gp_XYZ& theParams, int nbGetWorstLimit ) diff --git a/src/SMESHUtils/SMESH_FreeBorders.cxx b/src/SMESHUtils/SMESH_FreeBorders.cxx index b4d464947..e5913cdac 100644 --- a/src/SMESHUtils/SMESH_FreeBorders.cxx +++ b/src/SMESHUtils/SMESH_FreeBorders.cxx @@ -946,7 +946,7 @@ void SMESH_MeshAlgos::FindFreeBorders(SMDS_Mesh& theMesh, ++cnt; bordNodes.resize( cnt + 1 ); - BEdge* beLast; + BEdge* beLast = 0; for ( be = borders[i], cnt = 0; be && cnt < bordNodes.size()-1; be = be->myNext, ++cnt ) @@ -954,6 +954,7 @@ void SMESH_MeshAlgos::FindFreeBorders(SMDS_Mesh& theMesh, bordNodes[ cnt ] = be->myBNode1->Node(); beLast = be; } - bordNodes.back() = beLast->myBNode2->Node(); + if ( beLast ) + bordNodes.back() = beLast->myBNode2->Node(); } } diff --git a/src/SMESHUtils/SMESH_MAT2d.cxx b/src/SMESHUtils/SMESH_MAT2d.cxx index fbbb0553f..1f4db68b1 100644 --- a/src/SMESHUtils/SMESH_MAT2d.cxx +++ b/src/SMESHUtils/SMESH_MAT2d.cxx @@ -418,7 +418,7 @@ namespace */ //================================================================================ - void bndSegsToMesh( const vector< vector< BndSeg > >& bndSegsPerEdge ) + void bndSegsToMesh( const vector< vector< BndSeg > >& /*bndSegsPerEdge*/ ) { #ifdef _MYDEBUG_ if ( !getenv("bndSegsToMesh")) return; diff --git a/src/SMESHUtils/SMESH_MeshAlgos.cxx b/src/SMESHUtils/SMESH_MeshAlgos.cxx index db6f5e690..3bc48ff24 100644 --- a/src/SMESHUtils/SMESH_MeshAlgos.cxx +++ b/src/SMESHUtils/SMESH_MeshAlgos.cxx @@ -546,7 +546,8 @@ struct SMESH_ElementSearcherImpl: public SMESH_ElementSearcher { delete _ebbTree[i]; _ebbTree[i] = NULL; } - if ( _nodeSearcher ) delete _nodeSearcher; _nodeSearcher = 0; + if ( _nodeSearcher ) delete _nodeSearcher; + _nodeSearcher = 0; } virtual int FindElementsByPoint(const gp_Pnt& point, SMDSAbs_ElementType type, @@ -1673,7 +1674,7 @@ double SMESH_MeshAlgos::GetDistance( const SMDS_MeshFace* face, try { tgtCS = gp_Ax3( xyz[0], OZ, OX ); } - catch ( Standard_Failure ) { + catch ( Standard_Failure& ) { return badDistance; } trsf.SetTransformation( tgtCS ); diff --git a/src/SMESHUtils/SMESH_OctreeNode.cxx b/src/SMESHUtils/SMESH_OctreeNode.cxx index a4aa26434..ed65a74b8 100644 --- a/src/SMESHUtils/SMESH_OctreeNode.cxx +++ b/src/SMESHUtils/SMESH_OctreeNode.cxx @@ -116,7 +116,7 @@ Bnd_B3d* SMESH_OctreeNode::buildRootBox() */ //==================================================================================== -const bool SMESH_OctreeNode::isInside ( const gp_XYZ& p, const double precision ) +bool SMESH_OctreeNode::isInside ( const gp_XYZ& p, const double precision ) { if ( precision <= 0.) return !( getBox()->IsOut(p) ); diff --git a/src/SMESHUtils/SMESH_OctreeNode.hxx b/src/SMESHUtils/SMESH_OctreeNode.hxx index 3306dbc31..670843c9e 100644 --- a/src/SMESHUtils/SMESH_OctreeNode.hxx +++ b/src/SMESHUtils/SMESH_OctreeNode.hxx @@ -63,7 +63,7 @@ class SMESHUtils_EXPORT SMESH_OctreeNode : public SMESH_Octree virtual ~SMESH_OctreeNode () {}; // Tells us if Node is inside the current box with the precision "precision" - virtual const bool isInside(const gp_XYZ& p, const double precision = 0.); + virtual bool isInside(const gp_XYZ& p, const double precision = 0.); // Return in Result a list of Nodes potentials to be near Node void AllNodesAround(const SMDS_MeshNode * node, diff --git a/src/SMESHUtils/SMESH_Offset.cxx b/src/SMESHUtils/SMESH_Offset.cxx index a1adcccac..6aeabfb53 100644 --- a/src/SMESHUtils/SMESH_Offset.cxx +++ b/src/SMESHUtils/SMESH_Offset.cxx @@ -552,7 +552,7 @@ namespace bool getTranslatedPosition( const SMDS_MeshNode* theNewNode, const double theOffset, - const double theTol, + const double /*theTol*/, const double theSign, const std::vector< gp_XYZ >& theFaceNormals, SMDS_Mesh& theSrcMesh, @@ -2358,7 +2358,7 @@ namespace */ //================================================================================ - void CutFace::Dump() const + void CutFace::Dump() const // todo: unused in release mode { std::cout << std::endl << "INI F " << myInitFace->GetID() << std::endl; for ( size_t i = 0; i < myLinks.size(); ++i ) @@ -2497,7 +2497,7 @@ namespace */ //================================================================================ - void CutFace::AddPoint( const CutLink& p1, const CutLink& p2, double tol ) const + void CutFace::AddPoint( const CutLink& p1, const CutLink& p2, double /*tol*/ ) const { if ( myInitFace->GetNodeIndex( p1.IntNode() ) >= 0 || myInitFace->GetNodeIndex( p2.IntNode() ) >= 0 ) @@ -2756,7 +2756,7 @@ namespace // add links connecting internal loops with the boundary ones // find a pair of closest nodes - const SMDS_MeshNode *closestNode1, *closestNode2; + const SMDS_MeshNode *closestNode1 = 0, *closestNode2 = 0; double minDist = 1e100; for ( size_t iE = 0; iE < loop.myLinks.size(); ++iE ) { @@ -2779,10 +2779,12 @@ namespace } } - size_t i = myLinks.size(); - myLinks.resize( i + 2 ); - myLinks[ i ].Set( closestNode1, closestNode2 ); - myLinks[ i+1 ].Set( closestNode2, closestNode1 ); + if ( closestNode1 && closestNode2 ) { + size_t i = myLinks.size(); + myLinks.resize( i + 2 ); + myLinks[ i ].Set( closestNode1, closestNode2 ); + myLinks[ i+1 ].Set( closestNode2, closestNode1 ); + } } return true; @@ -2918,7 +2920,7 @@ namespace const double theSign, const std::vector< gp_XYZ >& theNormals, std::vector< EdgePart >& theCutOffLinks, - TLinkMap& theCutOffCoplanarLinks) const + TLinkMap& /*theCutOffCoplanarLinks*/) const { EdgePart sideEdge; boost::container::flat_set< const SMDS_MeshElement* > checkedCoplanar; diff --git a/src/SMESHUtils/SMESH_PolyLine.cxx b/src/SMESHUtils/SMESH_PolyLine.cxx index bf1b3aa70..9344611d6 100644 --- a/src/SMESHUtils/SMESH_PolyLine.cxx +++ b/src/SMESHUtils/SMESH_PolyLine.cxx @@ -421,7 +421,7 @@ namespace if ( face2 ) polySeg.myFace[ iP ] = face2; else - ;// ?? + {} // todo: ?? for ( int i = 0; i < 3; ++i ) { nodes[ i ] = polySeg.myFace[ iP ]->GetNode( i ); diff --git a/src/SMESHUtils/SMESH_Slot.cxx b/src/SMESHUtils/SMESH_Slot.cxx index b7b9b1518..33c16aa27 100644 --- a/src/SMESHUtils/SMESH_Slot.cxx +++ b/src/SMESHUtils/SMESH_Slot.cxx @@ -483,7 +483,7 @@ namespace const Segment* findTooCloseSegment( const IntPoint& p, const double minDist, - const double tol, + const double /*tol*/, const Segment* curSegment, const SMDS_MeshNode* curNode, const TSegmentsOfNode& segmentsOfNode ) diff --git a/src/SMESHUtils/SMESH_Triangulate.cxx b/src/SMESHUtils/SMESH_Triangulate.cxx index 10a79c750..149ce45b7 100644 --- a/src/SMESHUtils/SMESH_Triangulate.cxx +++ b/src/SMESHUtils/SMESH_Triangulate.cxx @@ -380,7 +380,7 @@ bool Triangulate::triangulate( std::vector< const SMDS_MeshNode*>& nodes, try { axes = gp_Ax2( p0, normal, v01 ); } - catch ( Standard_Failure ) { + catch ( Standard_Failure& ) { return false; } double factor = 1.0, modulus = normal.Modulus(); diff --git a/src/SMESHUtils/SMESH_TryCatch.cxx b/src/SMESHUtils/SMESH_TryCatch.cxx index 2f9194dfc..1c5044f0c 100644 --- a/src/SMESHUtils/SMESH_TryCatch.cxx +++ b/src/SMESHUtils/SMESH_TryCatch.cxx @@ -30,6 +30,7 @@ void SMESH::throwSalomeEx(const char* txt) void SMESH::doNothing(const char* txt) { + (void)txt; // unused in release mode MESSAGE( txt << " " << __FILE__ << ": " << __LINE__ ); } diff --git a/src/SMESH_I/SMESH_2smeshpy.cxx b/src/SMESH_I/SMESH_2smeshpy.cxx index b36b31c13..db7e04afa 100644 --- a/src/SMESH_I/SMESH_2smeshpy.cxx +++ b/src/SMESH_I/SMESH_2smeshpy.cxx @@ -50,22 +50,22 @@ #include #endif -IMPLEMENT_STANDARD_RTTIEXT(_pyObject ,Standard_Transient); -IMPLEMENT_STANDARD_RTTIEXT(_pyCommand ,Standard_Transient); -IMPLEMENT_STANDARD_RTTIEXT(_pyHypothesisReader,Standard_Transient); -IMPLEMENT_STANDARD_RTTIEXT(_pyGen ,_pyObject); -IMPLEMENT_STANDARD_RTTIEXT(_pyMesh ,_pyObject); -IMPLEMENT_STANDARD_RTTIEXT(_pySubMesh ,_pyObject); -IMPLEMENT_STANDARD_RTTIEXT(_pyMeshEditor ,_pyObject); -IMPLEMENT_STANDARD_RTTIEXT(_pyHypothesis ,_pyObject); -IMPLEMENT_STANDARD_RTTIEXT(_pySelfEraser ,_pyObject); -IMPLEMENT_STANDARD_RTTIEXT(_pyGroup ,_pyObject); -IMPLEMENT_STANDARD_RTTIEXT(_pyFilter ,_pyObject); -IMPLEMENT_STANDARD_RTTIEXT(_pyAlgorithm ,_pyHypothesis); -IMPLEMENT_STANDARD_RTTIEXT(_pyComplexParamHypo,_pyHypothesis); -IMPLEMENT_STANDARD_RTTIEXT(_pyNumberOfSegmentsHyp,_pyHypothesis); -IMPLEMENT_STANDARD_RTTIEXT(_pyLayerDistributionHypo,_pyHypothesis); -IMPLEMENT_STANDARD_RTTIEXT(_pySegmentLengthAroundVertexHyp,_pyHypothesis); +IMPLEMENT_STANDARD_RTTIEXT(_pyObject ,Standard_Transient) +IMPLEMENT_STANDARD_RTTIEXT(_pyCommand ,Standard_Transient) +IMPLEMENT_STANDARD_RTTIEXT(_pyHypothesisReader,Standard_Transient) +IMPLEMENT_STANDARD_RTTIEXT(_pyGen ,_pyObject) +IMPLEMENT_STANDARD_RTTIEXT(_pyMesh ,_pyObject) +IMPLEMENT_STANDARD_RTTIEXT(_pySubMesh ,_pyObject) +IMPLEMENT_STANDARD_RTTIEXT(_pyMeshEditor ,_pyObject) +IMPLEMENT_STANDARD_RTTIEXT(_pyHypothesis ,_pyObject) +IMPLEMENT_STANDARD_RTTIEXT(_pySelfEraser ,_pyObject) +IMPLEMENT_STANDARD_RTTIEXT(_pyGroup ,_pyObject) +IMPLEMENT_STANDARD_RTTIEXT(_pyFilter ,_pyObject) +IMPLEMENT_STANDARD_RTTIEXT(_pyAlgorithm ,_pyHypothesis) +IMPLEMENT_STANDARD_RTTIEXT(_pyComplexParamHypo,_pyHypothesis) +IMPLEMENT_STANDARD_RTTIEXT(_pyNumberOfSegmentsHyp,_pyHypothesis) +IMPLEMENT_STANDARD_RTTIEXT(_pyLayerDistributionHypo,_pyHypothesis) +IMPLEMENT_STANDARD_RTTIEXT(_pySegmentLengthAroundVertexHyp,_pyHypothesis) using namespace std; using SMESH::TPythonDump; @@ -930,8 +930,8 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand if ( -1 < iGeom && iGeom < nbTypes ) Threshold = SMESH + types[ iGeom ]; #ifdef _DEBUG_ - // is types complete? (compilation failure mains that enum GeometryType changed) - int _asrt[( sizeof(types) / sizeof(const char*) == nbTypes ) ? 2 : -1 ]; _asrt[0]=_asrt[1]; + // is types complete? (compilation failure means that enum GeometryType changed) + int _asrt[( sizeof(types) / sizeof(const char*) == nbTypes ) ? 2 : -1 ]; _asrt[0]=_asrt[1]; // _asrt[1] may be used uninitialized => replace this with static_assert? #endif } if (Type == "SMESH.FT_EntityType") @@ -950,8 +950,8 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand if ( -1 < iGeom && iGeom < nbTypes ) Threshold = SMESH + types[ iGeom ]; #ifdef _DEBUG_ - // is 'types' complete? (compilation failure mains that enum EntityType changed) - int _asrt[( sizeof(types) / sizeof(const char*) == nbTypes ) ? 2 : -1 ]; _asrt[0]=_asrt[1]; + // is 'types' complete? (compilation failure means that enum EntityType changed) + int _asrt[( sizeof(types) / sizeof(const char*) == nbTypes ) ? 2 : -1 ]; _asrt[0]=_asrt[1]; // _asrt[1] may be used uninitialized => replace this with static_assert? #endif } } @@ -1230,7 +1230,7 @@ void _pyGen::Flush() */ //================================================================================ -void _pyGen::PlaceSubmeshAfterItsCreation( Handle(_pyCommand) theCmdUsingSubmesh ) const +void _pyGen::PlaceSubmeshAfterItsCreation( Handle(_pyCommand) /*theCmdUsingSubmesh*/ ) const { // map< _pyID, Handle(_pyObject) >::const_iterator id_obj = myObjects.begin(); // for ( ; id_obj != myObjects.end(); ++id_obj ) @@ -4482,7 +4482,7 @@ _pySubMesh::_pySubMesh(const Handle(_pyCommand)& theCreationCmd, bool toKeepAgrC */ //================================================================================ -bool _pySubMesh::CanBeArgOfMethod(const _AString& theMethodName) +bool _pySubMesh::CanBeArgOfMethod(const _AString& /*theMethodName*/) { return false; // names of all methods where a sub-mesh can be used as argument diff --git a/src/SMESH_I/SMESH_2smeshpy.hxx b/src/SMESH_I/SMESH_2smeshpy.hxx index 994b11cb3..c8c0a6374 100644 --- a/src/SMESH_I/SMESH_2smeshpy.hxx +++ b/src/SMESH_I/SMESH_2smeshpy.hxx @@ -74,16 +74,16 @@ class _pyHypothesis; class _pyAlgorithm; class _pyHypothesisReader; -DEFINE_STANDARD_HANDLE (_pyCommand ,Standard_Transient); -DEFINE_STANDARD_HANDLE (_pyObject ,Standard_Transient); -DEFINE_STANDARD_HANDLE (_pyHypothesisReader,Standard_Transient); -DEFINE_STANDARD_HANDLE (_pyGen ,_pyObject); -DEFINE_STANDARD_HANDLE (_pyMesh ,_pyObject); -DEFINE_STANDARD_HANDLE (_pySubMesh ,_pyObject); -DEFINE_STANDARD_HANDLE (_pyGroup ,_pySubMesh); -DEFINE_STANDARD_HANDLE (_pyMeshEditor ,_pyObject); -DEFINE_STANDARD_HANDLE (_pyHypothesis ,_pyObject); -DEFINE_STANDARD_HANDLE (_pyAlgorithm ,_pyHypothesis); +DEFINE_STANDARD_HANDLE (_pyCommand ,Standard_Transient) +DEFINE_STANDARD_HANDLE (_pyObject ,Standard_Transient) +DEFINE_STANDARD_HANDLE (_pyHypothesisReader,Standard_Transient) +DEFINE_STANDARD_HANDLE (_pyGen ,_pyObject) +DEFINE_STANDARD_HANDLE (_pyMesh ,_pyObject) +DEFINE_STANDARD_HANDLE (_pySubMesh ,_pyObject) +DEFINE_STANDARD_HANDLE (_pyGroup ,_pySubMesh) +DEFINE_STANDARD_HANDLE (_pyMeshEditor ,_pyObject) +DEFINE_STANDARD_HANDLE (_pyHypothesis ,_pyObject) +DEFINE_STANDARD_HANDLE (_pyAlgorithm ,_pyHypothesis) typedef TCollection_AsciiString _pyID; typedef TCollection_AsciiString _AString; @@ -490,7 +490,7 @@ public: virtual bool Addition2Creation( const Handle(_pyCommand)& theAdditionCmd, const _pyID& theMesh); virtual const char* AccessorMethod() const { return "GetAlgorithm()"; } - virtual bool IsWrappable(const _pyID& theMesh) { return !myIsWrapped; } + virtual bool IsWrappable(const _pyID& /*theMesh*/) { return !myIsWrapped; } DEFINE_STANDARD_RTTIEXT(_pyAlgorithm,_pyHypothesis) }; @@ -509,7 +509,7 @@ public: DEFINE_STANDARD_RTTIEXT(_pyComplexParamHypo,_pyHypothesis) }; -DEFINE_STANDARD_HANDLE (_pyComplexParamHypo, _pyHypothesis); +DEFINE_STANDARD_HANDLE (_pyComplexParamHypo, _pyHypothesis) // ------------------------------------------------------------------------------------- /*! @@ -531,7 +531,7 @@ public: DEFINE_STANDARD_RTTIEXT(_pyLayerDistributionHypo,_pyHypothesis) }; -DEFINE_STANDARD_HANDLE (_pyLayerDistributionHypo, _pyHypothesis); +DEFINE_STANDARD_HANDLE (_pyLayerDistributionHypo, _pyHypothesis) // ------------------------------------------------------------------------------------- /*! @@ -548,7 +548,7 @@ public: DEFINE_STANDARD_RTTIEXT(_pyNumberOfSegmentsHyp,_pyHypothesis) }; -DEFINE_STANDARD_HANDLE (_pyNumberOfSegmentsHyp, _pyHypothesis); +DEFINE_STANDARD_HANDLE (_pyNumberOfSegmentsHyp, _pyHypothesis) // ------------------------------------------------------------------------------------- /*! @@ -563,7 +563,7 @@ public: const _pyID& theMesh); DEFINE_STANDARD_RTTIEXT(_pySegmentLengthAroundVertexHyp,_pyHypothesis) }; -DEFINE_STANDARD_HANDLE (_pySegmentLengthAroundVertexHyp, _pyHypothesis); +DEFINE_STANDARD_HANDLE (_pySegmentLengthAroundVertexHyp, _pyHypothesis) // ------------------------------------------------------------------------------------- /*! @@ -582,7 +582,7 @@ public: DEFINE_STANDARD_RTTIEXT(_pySelfEraser,_pyObject) }; -DEFINE_STANDARD_HANDLE (_pySelfEraser, _pyObject); +DEFINE_STANDARD_HANDLE (_pySelfEraser, _pyObject) // ------------------------------------------------------------------------------------- /*! @@ -624,7 +624,7 @@ public: DEFINE_STANDARD_RTTIEXT(_pyFilter,_pyObject) }; -DEFINE_STANDARD_HANDLE (_pyFilter, _pyObject); +DEFINE_STANDARD_HANDLE (_pyFilter, _pyObject) // ------------------------------------------------------------------------------------- /*! diff --git a/src/SMESH_I/SMESH_Algo_i.cxx b/src/SMESH_I/SMESH_Algo_i.cxx index caa151d88..2180be542 100644 --- a/src/SMESH_I/SMESH_Algo_i.cxx +++ b/src/SMESH_I/SMESH_Algo_i.cxx @@ -88,8 +88,8 @@ SMESH::ListOfHypothesisName* SMESH_Algo_i::GetCompatibleHypothesis() */ //================================================================================ -bool SMESH_Algo_i::getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const +bool SMESH_Algo_i::getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return false; } @@ -100,8 +100,8 @@ bool SMESH_Algo_i::getObjectsDependOn( std::vector< std::string > & entryArray, */ //================================================================================ -bool SMESH_Algo_i::setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) +bool SMESH_Algo_i::setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } diff --git a/src/SMESH_I/SMESH_Filter_i.cxx b/src/SMESH_I/SMESH_Filter_i.cxx index ae97ce1c6..f8d0eb567 100644 --- a/src/SMESH_I/SMESH_Filter_i.cxx +++ b/src/SMESH_I/SMESH_Filter_i.cxx @@ -718,7 +718,7 @@ BadOrientedVolume_i::BadOrientedVolume_i() { Controls::PredicatePtr control( new Controls::BadOrientedVolume() ); myFunctorPtr = myPredicatePtr = control; -}; +} FunctorType BadOrientedVolume_i::GetFunctorType() { @@ -733,7 +733,7 @@ BareBorderVolume_i::BareBorderVolume_i() { Controls::PredicatePtr control( new Controls::BareBorderVolume() ); myFunctorPtr = myPredicatePtr = control; -}; +} FunctorType BareBorderVolume_i::GetFunctorType() { @@ -748,7 +748,7 @@ BareBorderFace_i::BareBorderFace_i() { Controls::PredicatePtr control( new Controls::BareBorderFace() ); myFunctorPtr = myPredicatePtr = control; -}; +} FunctorType BareBorderFace_i::GetFunctorType() { @@ -763,7 +763,7 @@ OverConstrainedVolume_i::OverConstrainedVolume_i() { Controls::PredicatePtr control( new Controls::OverConstrainedVolume() ); myFunctorPtr = myPredicatePtr = control; -}; +} FunctorType OverConstrainedVolume_i::GetFunctorType() { @@ -778,7 +778,7 @@ OverConstrainedFace_i::OverConstrainedFace_i() { Controls::PredicatePtr control( new Controls::OverConstrainedFace() ); myFunctorPtr = myPredicatePtr = control; -}; +} FunctorType OverConstrainedFace_i::GetFunctorType() { @@ -843,7 +843,7 @@ void BelongToMeshGroup_i::SetGroupID( const char* theID ) // IOR or StoreName std::string BelongToMeshGroup_i::GetGroupID() { if ( myGroup->_is_nil() ) - SMESH::SMESH_GroupBase_var( GetGroup() ); + SMESH::SMESH_GroupBase_var( GetGroup() ); // todo: unnecessary parentheses? if ( !myGroup->_is_nil() ) myID = SMESH_Gen_i::GetORB()->object_to_string( myGroup ); @@ -1637,7 +1637,6 @@ void ConnectedElements_i::SetPoint( CORBA::Double x, CORBA::Double y, CORBA::Dou } void ConnectedElements_i::SetVertex( GEOM::GEOM_Object_ptr vertex ) - throw (SALOME::SALOME_Exception) { TopoDS_Shape shape = SMESH_Gen_i::GetSMESHGen()->GeomObjectToShape( vertex ); if ( shape.IsNull() ) @@ -1659,7 +1658,6 @@ void ConnectedElements_i::SetVertex( GEOM::GEOM_Object_ptr vertex ) } void ConnectedElements_i::SetNode ( CORBA::Long nodeID ) - throw (SALOME::SALOME_Exception) { if ( nodeID < 1 ) THROW_SALOME_CORBA_EXCEPTION( "ConnectedElements_i::SetNode(): nodeID must be > 0", @@ -1675,7 +1673,6 @@ void ConnectedElements_i::SetNode ( CORBA::Long nodeID ) */ void ConnectedElements_i::SetThreshold ( const char* threshold, SMESH::ConnectedElements::ThresholdType type ) - throw (SALOME::SALOME_Exception) { if ( !threshold ) THROW_SALOME_CORBA_EXCEPTION( "ConnectedElements_i::SetThreshold(): NULL threshold", diff --git a/src/SMESH_I/SMESH_Filter_i.hxx b/src/SMESH_I/SMESH_Filter_i.hxx index c2525267d..3f786cd83 100644 --- a/src/SMESH_I/SMESH_Filter_i.hxx +++ b/src/SMESH_I/SMESH_Filter_i.hxx @@ -55,7 +55,7 @@ namespace SMESH */ struct NotifyerAndWaiter { - virtual void OnBaseObjModified(NotifyerAndWaiter* obj, bool removed) {}; + virtual void OnBaseObjModified(NotifyerAndWaiter* /*obj*/, bool /*removed*/) {}; // specific reaction on modification of a base object void Modified( bool removed=false, NotifyerAndWaiter* who = 0); @@ -822,13 +822,10 @@ namespace SMESH void SetElementType( ElementType theType ); void SetPoint( CORBA::Double x, CORBA::Double y, CORBA::Double z ); - void SetVertex( GEOM::GEOM_Object_ptr vertex ) - throw (SALOME::SALOME_Exception); - void SetNode ( CORBA::Long nodeID ) - throw (SALOME::SALOME_Exception); + void SetVertex( GEOM::GEOM_Object_ptr vertex ); + void SetNode ( CORBA::Long nodeID ); void SetThreshold ( const char* threshold, - SMESH::ConnectedElements::ThresholdType type ) - throw (SALOME::SALOME_Exception); + SMESH::ConnectedElements::ThresholdType type ); char* GetThreshold ( SMESH::ConnectedElements::ThresholdType& type ); private: diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx index 701de05a8..0d8754732 100644 --- a/src/SMESH_I/SMESH_Gen_i.cxx +++ b/src/SMESH_I/SMESH_Gen_i.cxx @@ -144,6 +144,11 @@ #include #include +#include +#include +#include +#include + using namespace std; using SMESH::TPythonDump; using SMESH::TVar; @@ -295,7 +300,7 @@ GEOM::GEOM_Gen_var SMESH_Gen_i::GetGeomEngine( bool isShaper ) GEOM::GEOM_Gen_var SMESH_Gen_i::GetGeomEngine( GEOM::GEOM_Object_ptr go ) { - GEOM::GEOM_Gen_ptr gen; + GEOM::GEOM_Gen_ptr gen = GEOM::GEOM_Gen::_nil(); if ( !CORBA::is_nil( go )) gen = go->GetGen(); return gen; @@ -414,7 +419,6 @@ SMESH_Gen_i::~SMESH_Gen_i() GenericHypothesisCreator_i* SMESH_Gen_i::getHypothesisCreator(const char* theHypName, const char* theLibName, std::string& thePlatformLibName) - throw (SALOME::SALOME_Exception) { std::string aPlatformLibName; /* It's Need to translate lib name for WIN32 or X platform */ @@ -551,7 +555,7 @@ SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::createHypothesis(const char* theHypName hypothesis_i = myHypothesis_i->_this(); int nextId = RegisterObject( hypothesis_i ); if(MYDEBUG) { MESSAGE( "Add hypo to map with id = "<< nextId ); } - else { nextId = 0; } // avoid "unused variable" warning in release mode + else { (void)nextId; } // avoid "unused variable" warning in release mode } return hypothesis_i._retn(); } @@ -565,7 +569,6 @@ SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::createHypothesis(const char* theHypName //============================================================================= SMESH::SMESH_Mesh_ptr SMESH_Gen_i::createMesh() - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); if(MYDEBUG) MESSAGE( "SMESH_Gen_i::createMesh" ); @@ -582,7 +585,7 @@ SMESH::SMESH_Mesh_ptr SMESH_Gen_i::createMesh() SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow( meshServant->_this() ); int nextId = RegisterObject( mesh ); if(MYDEBUG) { MESSAGE( "Add mesh to map with id = "<< nextId); } - else { nextId = 0; } // avoid "unused variable" warning in release mode + else { (void)nextId; } // avoid "unused variable" warning in release mode return mesh._retn(); } catch (SALOME_Exception& S_ex) { @@ -814,7 +817,6 @@ StudyContext* SMESH_Gen_i::GetStudyContext() SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::CreateHypothesis( const char* theHypName, const char* theLibName ) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); // Create hypothesis/algorithm @@ -849,7 +851,6 @@ SMESH_Gen_i::CreateHypothesisByAverageLength( const char* theHypType, const char* theLibName, CORBA::Double theAverageLength, CORBA::Boolean theQuadDominated) - throw ( SALOME::SALOME_Exception ) { SMESH::HypInitParams initParams = { ::SMESH_Hypothesis::BY_AVERAGE_LENGTH, theAverageLength, theQuadDominated }; @@ -890,7 +891,6 @@ SMESH_Gen_i::GetHypothesisParameterValues( const char* theHypTyp SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr theGeom, const SMESH::HypInitParams& theParams) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); @@ -1080,7 +1080,6 @@ CORBA::Boolean SMESH_Gen_i::GetSoleSubMeshUsingHyp( SMESH::SMESH_Hypothesis_ptr //============================================================================= void SMESH_Gen_i::SetBoundaryBoxSegmentation( CORBA::Long theNbSegments ) - throw ( SALOME::SALOME_Exception ) { if ( theNbSegments > 0 ) myGen.SetBoundaryBoxSegmentation( int( theNbSegments )); @@ -1095,7 +1094,6 @@ void SMESH_Gen_i::SetBoundaryBoxSegmentation( CORBA::Long theNbSegments ) //============================================================================= void SMESH_Gen_i::SetDefaultNbSegments(CORBA::Long theNbSegments) - throw ( SALOME::SALOME_Exception ) { if ( theNbSegments > 0 ) myGen.SetDefaultNbSegments( int(theNbSegments) ); @@ -1201,7 +1199,6 @@ char* SMESH_Gen_i::GetOption(const char* name) //============================================================================= SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMesh( GEOM::GEOM_Object_ptr theShapeObject ) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); if(MYDEBUG) MESSAGE( "SMESH_Gen_i::CreateMesh" ); @@ -1236,7 +1233,6 @@ SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMesh( GEOM::GEOM_Object_ptr theShapeObj //============================================================================= SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateEmptyMesh() - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); if(MYDEBUG) MESSAGE( "SMESH_Gen_i::CreateMesh" ); @@ -1266,7 +1262,7 @@ namespace */ //================================================================================ - void checkFileReadable( const char* theFileName ) throw ( SALOME::SALOME_Exception ) + void checkFileReadable( const char* theFileName ) { SMESH_File f ( theFileName ); if ( !f ) @@ -1290,7 +1286,6 @@ namespace //============================================================================= SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMeshesFromUNV( const char* theFileName ) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); @@ -1421,7 +1416,6 @@ SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromMEDorSAUV( const char* theFileNa SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromMED( const char* theFileName, SMESH::DriverMED_ReadStatus& theStatus) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); checkFileReadable( theFileName ); @@ -1441,7 +1435,6 @@ SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromMED( const char* SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromSAUV( const char* theFileName, SMESH::DriverMED_ReadStatus& theStatus) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); checkFileReadable( theFileName ); @@ -1484,7 +1477,6 @@ SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromSAUV( const char* //============================================================================= SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMeshesFromSTL( const char* theFileName ) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); checkFileReadable( theFileName ); @@ -1525,7 +1517,6 @@ SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMeshesFromSTL( const char* theFileName SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromCGNS( const char* theFileName, SMESH::DriverMED_ReadStatus& theStatus) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); checkFileReadable( theFileName ); @@ -1613,7 +1604,6 @@ SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMeshesFromGMF( const char* theFileName, CORBA::Boolean theMakeRequiredGroups, SMESH::ComputeError_out theError) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); checkFileReadable( theFileName ); @@ -1657,7 +1647,6 @@ SMESH_Gen_i::CreateMeshesFromGMF( const char* theFileName, CORBA::Boolean SMESH_Gen_i::IsReadyToCompute( SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr theShapeObject ) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); if(MYDEBUG) MESSAGE( "SMESH_Gen_i::IsReadyToCompute" ); @@ -1732,7 +1721,6 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::GetAlgoSO(const ::SMESH_Algo* algo) SMESH::compute_error_array* SMESH_Gen_i::GetComputeErrors( SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr theSubObject ) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetComputeErrors()" ); @@ -1807,7 +1795,6 @@ SMESH::compute_error_array* SMESH_Gen_i::GetComputeErrors( SMESH::SMESH_Mesh_ptr SMESH::MeshPreviewStruct* SMESH_Gen_i::GetBadInputElements( SMESH::SMESH_Mesh_ptr theMesh, CORBA::Short theSubShapeID ) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetBadInputElements()" ); @@ -1895,7 +1882,6 @@ SMESH::ListOfGroups* SMESH_Gen_i::MakeGroupsOfBadInputElements( SMESH::SMESH_Mesh_ptr theMesh, CORBA::Short theSubShapeID, const char* theGroupName ) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); @@ -1930,7 +1916,6 @@ SMESH_Gen_i::MakeGroupsOfBadInputElements( SMESH::SMESH_Mesh_ptr theMesh, SMESH::algo_error_array* SMESH_Gen_i::GetAlgoState( SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr theSubObject ) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetAlgoState()" ); @@ -1992,7 +1977,6 @@ SMESH::algo_error_array* SMESH_Gen_i::GetAlgoState( SMESH::SMESH_Mesh_ptr theMes SMESH::long_array* SMESH_Gen_i::GetSubShapesId( GEOM::GEOM_Object_ptr theMainShapeObject, const SMESH::object_array& theListOfSubShapeObject ) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetSubShapesId" ); @@ -2066,7 +2050,6 @@ SMESH_Gen_i::GetSubShapesId( GEOM::GEOM_Object_ptr theMainShapeObject, CORBA::Boolean SMESH_Gen_i::Compute( SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr theShapeObject ) - throw ( SALOME::SALOME_Exception ) { //MEMOSTAT; Unexpect aCatch(SALOME_SalomeException); @@ -2116,7 +2099,7 @@ CORBA::Boolean SMESH_Gen_i::Compute( SMESH::SMESH_Mesh_ptr theMesh, return ok; } } - catch ( std::bad_alloc ) { + catch ( std::bad_alloc& ) { INFOS( "Compute(): lack of memory" ); } catch ( SALOME_Exception& S_ex ) { @@ -2163,7 +2146,6 @@ SMESH::MeshPreviewStruct* SMESH_Gen_i::Precompute( SMESH::SMESH_Mesh_ptr theMesh GEOM::GEOM_Object_ptr theShapeObject, SMESH::Dimension theDimension, SMESH::long_array& theShapesId) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Precompute" ); @@ -2327,7 +2309,7 @@ SMESH::MeshPreviewStruct* SMESH_Gen_i::Precompute( SMESH::SMESH_Mesh_ptr theMesh } } } - catch ( std::bad_alloc ) { + catch ( std::bad_alloc& ) { INFOS( "Precompute(): lack of memory" ); } catch ( SALOME_Exception& S_ex ) { @@ -2351,7 +2333,6 @@ SMESH::MeshPreviewStruct* SMESH_Gen_i::Precompute( SMESH::SMESH_Mesh_ptr theMesh SMESH::long_array* SMESH_Gen_i::Evaluate(SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr theShapeObject) // SMESH::long_array& theNbElems) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Evaluate" ); @@ -2412,7 +2393,7 @@ SMESH::long_array* SMESH_Gen_i::Evaluate(SMESH::SMESH_Mesh_ptr theMesh, return nbels._retn(); } } - catch ( std::bad_alloc ) { + catch ( std::bad_alloc& ) { INFOS( "Evaluate(): lack of memory" ); } catch ( SALOME_Exception& S_ex ) { @@ -2439,7 +2420,6 @@ GEOM::GEOM_Object_ptr SMESH_Gen_i::GetGeometryByMeshElement( SMESH::SMESH_Mesh_ptr theMesh, CORBA::Long theElementID, const char* theGeomName) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); @@ -2503,7 +2483,6 @@ SMESH_Gen_i::GetGeometryByMeshElement( SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr SMESH_Gen_i::FindGeometryByMeshElement( SMESH::SMESH_Mesh_ptr theMesh, CORBA::Long theElementID) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); if ( CORBA::is_nil( theMesh ) ) @@ -2579,7 +2558,6 @@ SMESH_Gen_i::Concatenate(const SMESH::ListOfIDSources& theMeshesArray, CORBA::Boolean theMergeNodesAndElements, CORBA::Double theMergeTolerance, SMESH::SMESH_Mesh_ptr theMeshToAppendTo) - throw ( SALOME::SALOME_Exception ) { return ConcatenateCommon(theMeshesArray, theUniteIdenticalGroups, @@ -2604,7 +2582,6 @@ SMESH_Gen_i::ConcatenateWithGroups(const SMESH::ListOfIDSources& theMeshesArray, CORBA::Boolean theMergeNodesAndElements, CORBA::Double theMergeTolerance, SMESH::SMESH_Mesh_ptr theMeshToAppendTo) - throw ( SALOME::SALOME_Exception ) { return ConcatenateCommon(theMeshesArray, theUniteIdenticalGroups, @@ -2629,7 +2606,6 @@ SMESH_Gen_i::ConcatenateCommon(const SMESH::ListOfIDSources& theMeshesArray, CORBA::Double theMergeTolerance, CORBA::Boolean theCommonGroups, SMESH::SMESH_Mesh_ptr theMeshToAppendTo) - throw ( SALOME::SALOME_Exception ) { std::unique_ptr< TPythonDump > pPythonDump( new TPythonDump ); TPythonDump& pythonDump = *pPythonDump; // prevent dump of called methods @@ -2909,7 +2885,6 @@ SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CopyMesh(SMESH::SMESH_IDSource_ptr meshPart, const char* meshName, CORBA::Boolean toCopyGroups, CORBA::Boolean toKeepIDs) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); @@ -3684,7 +3659,6 @@ CORBA::Boolean SMESH_Gen_i::CopyMeshWithGeom( SMESH::SMESH_Mesh_ptr theSou SMESH::submesh_array_out theNewSubmeshes, SMESH::ListOfHypothesis_out theNewHypotheses, SMESH::string_array_out theInvalidEntries) -throw ( SALOME::SALOME_Exception ) { if ( CORBA::is_nil( theSourceMesh ) || CORBA::is_nil( theNewGeometry )) @@ -4790,7 +4764,8 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent, // store submesh order if any const TListOfListOfInt& theOrderIds = myLocMesh.GetMeshOrder(); - if ( theOrderIds.size() ) { + const bool isNewOrederVersion = true; // old version saves ids, new one, entries + if ( !theOrderIds.empty() && !isNewOrederVersion ) { // keep old version for reference char order_list[ 30 ]; strcpy( order_list, "Mesh Order" ); // count number of submesh ids @@ -4821,6 +4796,38 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent, // delete[] smIDs; } + if ( !theOrderIds.empty() && isNewOrederVersion ) + { + // convert ids to entries + std::list< std::list< std::string > > orderEntryLists; + for ( const TListOfInt& idList : theOrderIds ) + { + orderEntryLists.emplace_back(); + std::list< std::string > & entryList = orderEntryLists.back(); + for ( const int& id : idList ) + { + const TopoDS_Shape& shape = mySMESHDSMesh->IndexToShape( id ); + GEOM::GEOM_Object_var go = ShapeToGeomObject( shape ); + SALOMEDS::SObject_var so = ObjectToSObject( go ); + if ( !so->_is_nil() ) + { + CORBA::String_var entry = so->GetID(); + entryList.emplace_back( entry.in() ); + } + } + } + // convert orderEntryLists to string + std::ostringstream ostream; + boost::archive::text_oarchive( ostream ) << orderEntryLists; + std::string orderEntryString = ostream.str(); + + // write HDF group + aSize[ 0 ] = orderEntryString.size() + 1; + aDataset = new HDFdataset( "MeshOrder_new", aTopGroup, HDF_STRING, aSize, 1 ); + aDataset->CreateOnDisk(); + aDataset->WriteOnDisk((char*) orderEntryString.data() ); + aDataset->CloseOnDisk(); + } // groups root sub-branch SALOMEDS::SObject_wrap myGroupsBranch; @@ -5968,7 +5975,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent, } // read Sub-Mesh ORDER if any - if ( aTopGroup->ExistInternalObject( "Mesh Order" )) { + if ( aTopGroup->ExistInternalObject( "Mesh Order" )) { // old version keeps ids aDataset = new HDFdataset( "Mesh Order", aTopGroup ); aDataset->OpenOnDisk(); size = aDataset->GetSize(); @@ -5986,6 +5993,37 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent, myNewMeshImpl->GetImpl().SetMeshOrder( anOrderIds ); delete [] smIDs; } + if ( aTopGroup->ExistInternalObject( "MeshOrder_new" )) // new version keeps entries + { + aDataset = new HDFdataset( "MeshOrder_new", aTopGroup ); + aDataset->OpenOnDisk(); + size = aDataset->GetSize(); + std::string dataString; dataString.resize( size ); + aDataset->ReadFromDisk((char*) dataString.data() ); + aDataset->CloseOnDisk(); + + std::istringstream istream( dataString.data() ); + boost::archive::text_iarchive archive( istream ); + std::list< std::list< std::string > > orderEntryLists; + try { + archive >> orderEntryLists; + } + catch (...) {} + + TListOfListOfInt anOrderIds; + for ( const std::list< std::string >& entryList : orderEntryLists ) + { + anOrderIds.emplace_back(); + for ( const std::string & entry : entryList ) + { + GEOM::GEOM_Object_var go = GetGeomObjectByEntry( entry ); + TopoDS_Shape shape = GeomObjectToShape( go ); + if ( SMESH_subMesh* sm = myNewMeshImpl->GetImpl().GetSubMesh( shape )) + anOrderIds.back().emplace_back( sm->GetId() ); + } + } + myNewMeshImpl->GetImpl().SetMeshOrder( anOrderIds ); + } } // loop on meshes // update hyps needing full mesh data restored (issue 20918) @@ -6045,7 +6083,6 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent, } } } - pd << ""; // prevent optimizing pd out // creation of tree nodes for all data objects in the study // to support tree representation customization and drag-n-drop: @@ -6309,7 +6346,7 @@ CORBA::Boolean SMESH_Gen_i::IsApplicable ( const char* theAlgoType, SMESH_TRY; std::string aPlatformLibName; - typedef GenericHypothesisCreator_i* (*GetHypothesisCreator)(const char*); + //typedef GenericHypothesisCreator_i* (*GetHypothesisCreator)(const char*); GenericHypothesisCreator_i* aCreator = getHypothesisCreator(theAlgoType, theLibName, aPlatformLibName); if (aCreator) diff --git a/src/SMESH_I/SMESH_Gen_i.hxx b/src/SMESH_I/SMESH_Gen_i.hxx index 3c2e62f5d..fb16909b8 100644 --- a/src/SMESH_I/SMESH_Gen_i.hxx +++ b/src/SMESH_I/SMESH_Gen_i.hxx @@ -169,14 +169,12 @@ public: // Create hypothesis/algorithm of given type SMESH::SMESH_Hypothesis_ptr CreateHypothesis (const char* theHypType, - const char* theLibName) - throw ( SALOME::SALOME_Exception ); + const char* theLibName); SMESH::SMESH_Hypothesis_ptr CreateHypothesisByAverageLength( const char* theHypType, const char* theLibName, CORBA::Double theAverageLength, - CORBA::Boolean theQuadDominated) - throw ( SALOME::SALOME_Exception ); + CORBA::Boolean theQuadDominated); // Return hypothesis of given type holding parameter values of the existing mesh SMESH::SMESH_Hypothesis_ptr @@ -184,8 +182,7 @@ public: const char* theLibName, SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr theGeom, - const SMESH::HypInitParams& theWay) - throw ( SALOME::SALOME_Exception ); + const SMESH::HypInitParams& theWay); /* * Returns True if a hypothesis is assigned to a sole sub-mesh in a current Study @@ -200,11 +197,11 @@ public: * Sets number of segments per diagonal of boundary box of geometry by which * default segment length of appropriate 1D hypotheses is defined */ - void SetBoundaryBoxSegmentation( CORBA::Long theNbSegments ) throw ( SALOME::SALOME_Exception ); + void SetBoundaryBoxSegmentation( CORBA::Long theNbSegments ); /*! * \brief Sets default number of segments per edge */ - void SetDefaultNbSegments(CORBA::Long theNbSegments) throw ( SALOME::SALOME_Exception ); + void SetDefaultNbSegments(CORBA::Long theNbSegments); /*! Set an option value @@ -222,48 +219,39 @@ public: // Create empty mesh on a shape - SMESH::SMESH_Mesh_ptr CreateMesh( GEOM::GEOM_Object_ptr theShapeObject ) - throw ( SALOME::SALOME_Exception ); + SMESH::SMESH_Mesh_ptr CreateMesh( GEOM::GEOM_Object_ptr theShapeObject ); // Create empty mesh - SMESH::SMESH_Mesh_ptr CreateEmptyMesh() - throw ( SALOME::SALOME_Exception ); + SMESH::SMESH_Mesh_ptr CreateEmptyMesh(); // Create a mesh and import data from an UNV file - SMESH::SMESH_Mesh_ptr CreateMeshesFromUNV( const char* theFileName ) - throw ( SALOME::SALOME_Exception ); + SMESH::SMESH_Mesh_ptr CreateMeshesFromUNV( const char* theFileName ); // Create mesh(es) and import data from MED file SMESH::mesh_array* CreateMeshesFromMED( const char* theFileName, - SMESH::DriverMED_ReadStatus& theStatus ) - throw ( SALOME::SALOME_Exception ); + SMESH::DriverMED_ReadStatus& theStatus ); // Create mesh(es) and import data from MED file SMESH::mesh_array* CreateMeshesFromSAUV( const char* theFileName, - SMESH::DriverMED_ReadStatus& theStatus ) - throw ( SALOME::SALOME_Exception ); + SMESH::DriverMED_ReadStatus& theStatus ); // Create a mesh and import data from a STL file - SMESH::SMESH_Mesh_ptr CreateMeshesFromSTL( const char* theFileName ) - throw ( SALOME::SALOME_Exception ); + SMESH::SMESH_Mesh_ptr CreateMeshesFromSTL( const char* theFileName ); // Create mesh(es) and import data from CGNS file SMESH::mesh_array* CreateMeshesFromCGNS( const char* theFileName, - SMESH::DriverMED_ReadStatus& theStatus ) - throw ( SALOME::SALOME_Exception ); + SMESH::DriverMED_ReadStatus& theStatus ); // Create a mesh and import data from a GMF file SMESH::SMESH_Mesh_ptr CreateMeshesFromGMF( const char* theFileName, CORBA::Boolean theMakeRequiredGroups, - SMESH::ComputeError_out theError) - throw ( SALOME::SALOME_Exception ); + SMESH::ComputeError_out theError); // Copy a part of mesh SMESH::SMESH_Mesh_ptr CopyMesh(SMESH::SMESH_IDSource_ptr meshPart, const char* meshName, CORBA::Boolean toCopyGroups, - CORBA::Boolean toKeepIDs) - throw ( SALOME::SALOME_Exception ); + CORBA::Boolean toKeepIDs); // Create a mesh by copying definitions of another mesh to a given geometry CORBA::Boolean CopyMeshWithGeom( SMESH::SMESH_Mesh_ptr sourceMesh, @@ -276,13 +264,11 @@ public: SMESH::ListOfGroups_out newGroups, SMESH::submesh_array_out newSubmeshes, SMESH::ListOfHypothesis_out newHypotheses, - SMESH::string_array_out invalidEntries) - throw ( SALOME::SALOME_Exception ); + SMESH::string_array_out invalidEntries); // Compute mesh on a shape CORBA::Boolean Compute( SMESH::SMESH_Mesh_ptr theMesh, - GEOM::GEOM_Object_ptr theShapeObject ) - throw ( SALOME::SALOME_Exception ); + GEOM::GEOM_Object_ptr theShapeObject ); // Cancel Compute mesh on a shape void CancelCompute( SMESH::SMESH_Mesh_ptr theMesh, @@ -292,8 +278,7 @@ public: * \brief Return errors of mesh computation */ SMESH::compute_error_array* GetComputeErrors(SMESH::SMESH_Mesh_ptr theMesh, - GEOM::GEOM_Object_ptr theShapeObject ) - throw ( SALOME::SALOME_Exception ); + GEOM::GEOM_Object_ptr theShapeObject ); /*! * Evaluate mesh on a shape and @@ -301,13 +286,11 @@ public: * Result array of number enityties */ SMESH::long_array* Evaluate(SMESH::SMESH_Mesh_ptr theMesh, - GEOM::GEOM_Object_ptr theShapeObject) - throw ( SALOME::SALOME_Exception ); + GEOM::GEOM_Object_ptr theShapeObject); // Returns true if mesh contains enough data to be computed CORBA::Boolean IsReadyToCompute( SMESH::SMESH_Mesh_ptr theMesh, - GEOM::GEOM_Object_ptr theShapeObject ) - throw ( SALOME::SALOME_Exception ); + GEOM::GEOM_Object_ptr theShapeObject ); /*! * Calculate Mesh as preview till indicated dimension on shape @@ -317,40 +300,33 @@ public: SMESH::MeshPreviewStruct* Precompute( SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr theSubObject, SMESH::Dimension theDimension, - SMESH::long_array& theShapesId ) - throw ( SALOME::SALOME_Exception ); + SMESH::long_array& theShapesId ); // Returns errors of hypotheses definition SMESH::algo_error_array* GetAlgoState( SMESH::SMESH_Mesh_ptr theMesh, - GEOM::GEOM_Object_ptr theSubObject ) - throw ( SALOME::SALOME_Exception ); + GEOM::GEOM_Object_ptr theSubObject ); // Return mesh elements preventing computation of a subshape SMESH::MeshPreviewStruct* GetBadInputElements( SMESH::SMESH_Mesh_ptr theMesh, - CORBA::Short theSubShapeID ) - throw ( SALOME::SALOME_Exception ); + CORBA::Short theSubShapeID ); // Create groups of elements preventing computation of a sub-shape SMESH::ListOfGroups* MakeGroupsOfBadInputElements( SMESH::SMESH_Mesh_ptr theMesh, CORBA::Short theSubShapeID, - const char* theGroupName) - throw ( SALOME::SALOME_Exception ); + const char* theGroupName); // Get sub-shapes unique ID's list SMESH::long_array* GetSubShapesId( GEOM::GEOM_Object_ptr theMainShapeObject, - const SMESH::object_array& theListOfSubShape ) - throw ( SALOME::SALOME_Exception ); + const SMESH::object_array& theListOfSubShape ); // Return geometrical object the given element is built on. Publish it in study. GEOM::GEOM_Object_ptr GetGeometryByMeshElement( SMESH::SMESH_Mesh_ptr theMesh, CORBA::Long theElementID, - const char* theGeomName) - throw ( SALOME::SALOME_Exception ); + const char* theGeomName); // Return geometrical object the given element is built on. Don't publish it in study. GEOM::GEOM_Object_ptr FindGeometryByMeshElement( SMESH::SMESH_Mesh_ptr theMesh, - CORBA::Long theElementID) - throw ( SALOME::SALOME_Exception ); + CORBA::Long theElementID); // Concatenate the given meshes into one mesh SMESH::SMESH_Mesh_ptr ConcatenateCommon(const SMESH::ListOfIDSources& meshesArray, @@ -358,16 +334,14 @@ public: CORBA::Boolean mergeNodesAndElements, CORBA::Double mergeTolerance, CORBA::Boolean commonGroups, - SMESH::SMESH_Mesh_ptr meshToAppendTo) - throw ( SALOME::SALOME_Exception ); + SMESH::SMESH_Mesh_ptr meshToAppendTo); // Concatenate the given meshes into one mesh SMESH::SMESH_Mesh_ptr Concatenate(const SMESH::ListOfIDSources& meshesArray, CORBA::Boolean uniteIdenticalGroups, CORBA::Boolean mergeNodesAndElements, CORBA::Double mergeTolerance, - SMESH::SMESH_Mesh_ptr meshToAppendTo) - throw ( SALOME::SALOME_Exception ); + SMESH::SMESH_Mesh_ptr meshToAppendTo); // Concatenate the given meshes into one mesh // Create the groups of all elements from initial meshes @@ -375,8 +349,7 @@ public: CORBA::Boolean uniteIdenticalGroups, CORBA::Boolean mergeNodesAndElements, CORBA::Double mergeTolerance, - SMESH::SMESH_Mesh_ptr meshToAppendTo) - throw ( SALOME::SALOME_Exception ); + SMESH::SMESH_Mesh_ptr meshToAppendTo); // Get version of MED format being used. char* GetMEDFileVersion(); @@ -447,19 +420,18 @@ public: // Publish object in the study SALOMEDS::SObject_ptr PublishInStudy( SALOMEDS::SObject_ptr theSObject, CORBA::Object_ptr theObject, - const char* theName ) - throw ( SALOME::SALOME_Exception ); + const char* theName ); // Copy-paste methods - returns true if object can be copied to the clipboard - CORBA::Boolean CanCopy( SALOMEDS::SObject_ptr theObject ) { return false; } + CORBA::Boolean CanCopy( SALOMEDS::SObject_ptr /*theObject*/ ) { return false; } // Copy-paste methods - copy object to the clipboard - SALOMEDS::TMPFile* CopyFrom( SALOMEDS::SObject_ptr theObject, CORBA::Long& theObjectID ) { return NULL; } + SALOMEDS::TMPFile* CopyFrom( SALOMEDS::SObject_ptr /*theObject*/, CORBA::Long& /*theObjectID*/ ) { return NULL; } // Copy-paste methods - returns true if object can be pasted from the clipboard - CORBA::Boolean CanPaste( const char* theComponentName, CORBA::Long theObjectID ) { return false; } + CORBA::Boolean CanPaste( const char* /*theComponentName*/, CORBA::Long /*theObjectID*/ ) { return false; } // Copy-paste methods - paste object from the clipboard - SALOMEDS::SObject_ptr PasteInto( const SALOMEDS::TMPFile& theStream, - CORBA::Long theObjectID, - SALOMEDS::SObject_ptr theObject ) { + SALOMEDS::SObject_ptr PasteInto( const SALOMEDS::TMPFile& /*theStream*/, + CORBA::Long /*theObjectID*/, + SALOMEDS::SObject_ptr /*theObject*/ ) { SALOMEDS::SObject_var aResultSO; return aResultSO._retn(); } @@ -637,14 +609,12 @@ private: // Get hypothesis creator GenericHypothesisCreator_i* getHypothesisCreator( const char* theHypName, const char* theLibName, - std::string& thePlatformLibName) - throw ( SALOME::SALOME_Exception ); + std::string& thePlatformLibName); // Create hypothesis of given type SMESH::SMESH_Hypothesis_ptr createHypothesis( const char* theHypName, const char* theLibName); // Create empty mesh on shape - SMESH::SMESH_Mesh_ptr createMesh() - throw ( SALOME::SALOME_Exception ); + SMESH::SMESH_Mesh_ptr createMesh(); // Check mesh icon bool isGeomModifIcon( SMESH::SMESH_Mesh_ptr mesh ); diff --git a/src/SMESH_I/SMESH_Gen_i_1.cxx b/src/SMESH_I/SMESH_Gen_i_1.cxx index a667ba59f..8f6077ca9 100644 --- a/src/SMESH_I/SMESH_Gen_i_1.cxx +++ b/src/SMESH_I/SMESH_Gen_i_1.cxx @@ -503,10 +503,9 @@ static void addReference (SALOMEDS::SObject_ptr theSObject, */ //============================================================================= -SALOMEDS::SObject_ptr SMESH_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr theSObject, +SALOMEDS::SObject_ptr SMESH_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr /*theSObject*/, CORBA::Object_ptr theIOR, const char* theName) - throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); SALOMEDS::SObject_wrap aSO; diff --git a/src/SMESH_I/SMESH_Group_i.cxx b/src/SMESH_I/SMESH_Group_i.cxx index d9e14a0a9..d3fbdc742 100644 --- a/src/SMESH_I/SMESH_Group_i.cxx +++ b/src/SMESH_I/SMESH_Group_i.cxx @@ -98,7 +98,8 @@ SMESH_GroupOnFilter_i::SMESH_GroupOnFilter_i( PortableServer::POA_ptr thePOA, SMESH_GroupBase_i::~SMESH_GroupBase_i() { - if ( myPreMeshInfo ) delete myPreMeshInfo; myPreMeshInfo = NULL; + if ( myPreMeshInfo ) delete myPreMeshInfo; + myPreMeshInfo = NULL; } //======================================================================= @@ -798,7 +799,6 @@ SMESH_PredicatePtr SMESH_GroupOnFilter_i::GetPredicate( SMESH::Filter_ptr filter //================================================================================ void SMESH_GroupOnFilter_i::SetFilter(SMESH::Filter_ptr theFilter) - throw (SALOME::SALOME_Exception) { if ( myFilter->_is_equivalent( theFilter )) return; @@ -1072,7 +1072,7 @@ SMESH_GroupOnFilter_i::~SMESH_GroupOnFilter_i() */ //================================================================================ -void SMESH_GroupOnFilter_i::OnBaseObjModified(NotifyerAndWaiter* filter, bool /*removed*/) +void SMESH_GroupOnFilter_i::OnBaseObjModified(NotifyerAndWaiter* /*filter*/, bool /*removed*/) { if ( myPreMeshInfo ) myPreMeshInfo->FullLoadFromFile(); diff --git a/src/SMESH_I/SMESH_Group_i.hxx b/src/SMESH_I/SMESH_Group_i.hxx index 42e91ca81..92a34a248 100644 --- a/src/SMESH_I/SMESH_Group_i.hxx +++ b/src/SMESH_I/SMESH_Group_i.hxx @@ -196,7 +196,7 @@ class SMESH_I_EXPORT SMESH_GroupOnFilter_i: static SMESH_PredicatePtr GetPredicate( SMESH::Filter_ptr ); // CORBA interface implementation - void SetFilter(SMESH::Filter_ptr theFilter) throw (SALOME::SALOME_Exception); + void SetFilter(SMESH::Filter_ptr theFilter); SMESH::Filter_ptr GetFilter(); virtual CORBA::Boolean IsUpToDate(); virtual SMESH::long_array* GetListOfID(); diff --git a/src/SMESH_I/SMESH_Hypothesis_i.cxx b/src/SMESH_I/SMESH_Hypothesis_i.cxx index 4383564a7..fae136798 100644 --- a/src/SMESH_I/SMESH_Hypothesis_i.cxx +++ b/src/SMESH_I/SMESH_Hypothesis_i.cxx @@ -50,7 +50,7 @@ SMESH_Hypothesis_i::SMESH_Hypothesis_i( PortableServer::POA_ptr thePOA ) : SALOME::GenericObj_i( thePOA ) { myBaseImpl = 0; -}; +} //============================================================================= /*! @@ -65,7 +65,7 @@ SMESH_Hypothesis_i::~SMESH_Hypothesis_i() //MESSAGE( "SMESH_Hypothesis_i::~SMESH_Hypothesis_i" ); if ( myBaseImpl ) delete myBaseImpl; -}; +} //============================================================================= /*! @@ -78,7 +78,7 @@ SMESH_Hypothesis_i::~SMESH_Hypothesis_i() char* SMESH_Hypothesis_i::GetName() { return CORBA::string_dup( myBaseImpl->GetName() ); -}; +} //============================================================================= /*! @@ -91,7 +91,7 @@ char* SMESH_Hypothesis_i::GetName() char* SMESH_Hypothesis_i::GetLibName() { return CORBA::string_dup( myBaseImpl->GetLibName() ); -}; +} //============================================================================= /*! @@ -104,7 +104,7 @@ char* SMESH_Hypothesis_i::GetLibName() void SMESH_Hypothesis_i::SetLibName(const char* theLibName) { myBaseImpl->SetLibName( theLibName ); -}; +} //============================================================================= /*! diff --git a/src/SMESH_I/SMESH_Hypothesis_i.hxx b/src/SMESH_I/SMESH_Hypothesis_i.hxx index af5102563..0fcc83ca8 100644 --- a/src/SMESH_I/SMESH_Hypothesis_i.hxx +++ b/src/SMESH_I/SMESH_Hypothesis_i.hxx @@ -131,10 +131,10 @@ public: // method used to convert variable parameters stored in an old study // into myMethod2VarParams. It should return a method name for an index of // variable parameters. Index is countered from zero - virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const { return ""; } + virtual std::string getMethodOfParameter(const int /*paramIndex*/, int /*nbVars*/) const { return ""; } // method intended to remove explicit treatment of Netgen hypotheses from SMESH_NoteBook - virtual int getParamIndex(const TCollection_AsciiString& method, int nbVars) const { return -1; } + virtual int getParamIndex(const TCollection_AsciiString& /*method*/, int /*nbVars*/) const { return -1; } }; // ====================================================== @@ -152,7 +152,7 @@ public: virtual std::string GetModuleName() = 0; // Check if an algorithm is applicable to a shape - virtual bool IsApplicable( const TopoDS_Shape &S, bool toCheckAll, int algoDim ) + virtual bool IsApplicable( const TopoDS_Shape &S, bool /*toCheckAll*/, int algoDim ) { return IsShapeOfDim( S, algoDim ); } diff --git a/src/SMESH_I/SMESH_MeshEditor_i.cxx b/src/SMESH_I/SMESH_MeshEditor_i.cxx index 3330950a2..d542d9c85 100644 --- a/src/SMESH_I/SMESH_MeshEditor_i.cxx +++ b/src/SMESH_I/SMESH_MeshEditor_i.cxx @@ -193,8 +193,8 @@ namespace MeshEditor_I { //!< Delete theNodeSearcher static void Delete() { - if ( theNodeSearcher ) delete theNodeSearcher; theNodeSearcher = 0; - if ( theElementSearcher ) delete theElementSearcher; theElementSearcher = 0; + if ( theNodeSearcher ) { delete theNodeSearcher; } theNodeSearcher = 0; + if ( theElementSearcher ) { delete theElementSearcher; } theElementSearcher = 0; } typedef map < int, SMESH_subMesh * > TDependsOnMap; //!< The meshod called by submesh: do my main job @@ -523,7 +523,6 @@ TPreviewMesh * SMESH_MeshEditor_i::getPreviewMesh(SMDSAbs_ElementType previewEle //================================================================================ SMESH::MeshPreviewStruct* SMESH_MeshEditor_i::GetPreviewData() - throw (SALOME::SALOME_Exception) { SMESH_TRY; const bool hasBadElems = ( getEditor().GetError() && getEditor().GetError()->HasBadElems() ); @@ -617,7 +616,6 @@ SMESH::MeshPreviewStruct* SMESH_MeshEditor_i::GetPreviewData() //================================================================================ SMESH::long_array* SMESH_MeshEditor_i::GetLastCreatedNodes() - throw (SALOME::SALOME_Exception) { SMESH_TRY; SMESH::long_array_var myLastCreatedNodes = new SMESH::long_array(); @@ -640,7 +638,6 @@ SMESH::long_array* SMESH_MeshEditor_i::GetLastCreatedNodes() //================================================================================ SMESH::long_array* SMESH_MeshEditor_i::GetLastCreatedElems() - throw (SALOME::SALOME_Exception) { SMESH_TRY; SMESH::long_array_var myLastCreatedElems = new SMESH::long_array(); @@ -660,7 +657,7 @@ SMESH::long_array* SMESH_MeshEditor_i::GetLastCreatedElems() //purpose : Clears sequences of last created elements and nodes //======================================================================= -void SMESH_MeshEditor_i::ClearLastCreated() throw (SALOME::SALOME_Exception) +void SMESH_MeshEditor_i::ClearLastCreated() { SMESH_TRY; getEditor().ClearLastCreated(); @@ -675,7 +672,6 @@ void SMESH_MeshEditor_i::ClearLastCreated() throw (SALOME::SALOME_Exception) //======================================================================= SMESH::ComputeError* SMESH_MeshEditor_i::GetLastError() - throw (SALOME::SALOME_Exception) { SMESH_TRY; SMESH::ComputeError_var errOut = new SMESH::ComputeError; @@ -787,7 +783,6 @@ CORBA::Long* SMESH_MeshEditor_i::GetTemporaryIDs( SMESH::SMESH_IDSource_ptr& idS CORBA::Boolean SMESH_MeshEditor_i::RemoveElements(const SMESH::long_array & IDsOfElements) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -817,7 +812,6 @@ SMESH_MeshEditor_i::RemoveElements(const SMESH::long_array & IDsOfElements) //============================================================================= CORBA::Boolean SMESH_MeshEditor_i::RemoveNodes(const SMESH::long_array & IDsOfNodes) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -845,7 +839,6 @@ CORBA::Boolean SMESH_MeshEditor_i::RemoveNodes(const SMESH::long_array & IDsOfNo //============================================================================= CORBA::Long SMESH_MeshEditor_i::RemoveOrphanNodes() - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -879,7 +872,6 @@ CORBA::Long SMESH_MeshEditor_i::RemoveOrphanNodes() //============================================================================= CORBA::Long SMESH_MeshEditor_i::AddNode(CORBA::Double x,CORBA::Double y, CORBA::Double z) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -905,7 +897,6 @@ CORBA::Long SMESH_MeshEditor_i::AddNode(CORBA::Double x,CORBA::Double y, CORBA:: CORBA::Long SMESH_MeshEditor_i::Add0DElement(CORBA::Long IDOfNode, CORBA::Boolean DuplicateElements) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -935,7 +926,6 @@ CORBA::Long SMESH_MeshEditor_i::Add0DElement(CORBA::Long IDOfNode, //============================================================================= CORBA::Long SMESH_MeshEditor_i::AddBall(CORBA::Long IDOfNode, CORBA::Double diameter) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -965,7 +955,6 @@ CORBA::Long SMESH_MeshEditor_i::AddBall(CORBA::Long IDOfNode, CORBA::Double diam //============================================================================= CORBA::Long SMESH_MeshEditor_i::AddEdge(const SMESH::long_array & IDsOfNodes) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -1009,7 +998,6 @@ CORBA::Long SMESH_MeshEditor_i::AddEdge(const SMESH::long_array & IDsOfNodes) //============================================================================= CORBA::Long SMESH_MeshEditor_i::AddFace(const SMESH::long_array & IDsOfNodes) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -1058,7 +1046,6 @@ CORBA::Long SMESH_MeshEditor_i::AddFace(const SMESH::long_array & IDsOfNodes) //============================================================================= CORBA::Long SMESH_MeshEditor_i::AddPolygonalFace (const SMESH::long_array & IDsOfNodes) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -1094,7 +1081,6 @@ CORBA::Long SMESH_MeshEditor_i::AddPolygonalFace (const SMESH::long_array & IDsO //============================================================================= CORBA::Long SMESH_MeshEditor_i::AddQuadPolygonalFace (const SMESH::long_array & IDsOfNodes) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -1130,7 +1116,6 @@ CORBA::Long SMESH_MeshEditor_i::AddQuadPolygonalFace (const SMESH::long_array & //============================================================================= CORBA::Long SMESH_MeshEditor_i::AddVolume(const SMESH::long_array & IDsOfNodes) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -1191,7 +1176,6 @@ CORBA::Long SMESH_MeshEditor_i::AddVolume(const SMESH::long_array & IDsOfNodes) //============================================================================= CORBA::Long SMESH_MeshEditor_i::AddPolyhedralVolume (const SMESH::long_array & IDsOfNodes, const SMESH::long_array & Quantities) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -1230,7 +1214,6 @@ CORBA::Long SMESH_MeshEditor_i::AddPolyhedralVolume (const SMESH::long_array & I //============================================================================= CORBA::Long SMESH_MeshEditor_i::AddPolyhedralVolumeByFaces (const SMESH::long_array & IdsOfFaces) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -1278,7 +1261,6 @@ SMESH::SMESH_IDSource_ptr SMESH_MeshEditor_i::Create0DElementsOnAllNodes(SMESH::SMESH_IDSource_ptr theObject, const char* theGroupName, CORBA::Boolean theDuplicateElements) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -1348,7 +1330,6 @@ SMESH_MeshEditor_i::Create0DElementsOnAllNodes(SMESH::SMESH_IDSource_ptr theObje //============================================================================= void SMESH_MeshEditor_i::SetNodeOnVertex(CORBA::Long NodeID, CORBA::Long VertexID) - throw (SALOME::SALOME_Exception) { SMESH_TRY; @@ -1383,7 +1364,6 @@ void SMESH_MeshEditor_i::SetNodeOnVertex(CORBA::Long NodeID, CORBA::Long VertexI void SMESH_MeshEditor_i::SetNodeOnEdge(CORBA::Long NodeID, CORBA::Long EdgeID, CORBA::Double paramOnEdge) - throw (SALOME::SALOME_Exception) { SMESH_TRY; @@ -1427,7 +1407,6 @@ void SMESH_MeshEditor_i::SetNodeOnEdge(CORBA::Long NodeID, CORBA::Long EdgeID, void SMESH_MeshEditor_i::SetNodeOnFace(CORBA::Long NodeID, CORBA::Long FaceID, CORBA::Double u, CORBA::Double v) - throw (SALOME::SALOME_Exception) { SMESH_TRY; SMESHDS_Mesh * mesh = getMeshDS(); @@ -1472,7 +1451,6 @@ void SMESH_MeshEditor_i::SetNodeOnFace(CORBA::Long NodeID, CORBA::Long FaceID, //============================================================================= void SMESH_MeshEditor_i::SetNodeInVolume(CORBA::Long NodeID, CORBA::Long SolidID) - throw (SALOME::SALOME_Exception) { SMESH_TRY; SMESHDS_Mesh * mesh = getMeshDS(); @@ -1503,7 +1481,6 @@ void SMESH_MeshEditor_i::SetNodeInVolume(CORBA::Long NodeID, CORBA::Long SolidID void SMESH_MeshEditor_i::SetMeshElementOnShape(CORBA::Long ElementID, CORBA::Long ShapeID) - throw (SALOME::SALOME_Exception) { SMESH_TRY; SMESHDS_Mesh * mesh = getMeshDS(); @@ -1536,7 +1513,6 @@ void SMESH_MeshEditor_i::SetMeshElementOnShape(CORBA::Long ElementID, CORBA::Boolean SMESH_MeshEditor_i::InverseDiag(CORBA::Long NodeID1, CORBA::Long NodeID2) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -1567,7 +1543,6 @@ CORBA::Boolean SMESH_MeshEditor_i::InverseDiag(CORBA::Long NodeID1, CORBA::Boolean SMESH_MeshEditor_i::DeleteDiag(CORBA::Long NodeID1, CORBA::Long NodeID2) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -1599,7 +1574,6 @@ CORBA::Boolean SMESH_MeshEditor_i::DeleteDiag(CORBA::Long NodeID1, //============================================================================= CORBA::Boolean SMESH_MeshEditor_i::Reorient(const SMESH::long_array & IDsOfElements) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -1628,7 +1602,6 @@ CORBA::Boolean SMESH_MeshEditor_i::Reorient(const SMESH::long_array & IDsOfEleme //============================================================================= CORBA::Boolean SMESH_MeshEditor_i::ReorientObject(SMESH::SMESH_IDSource_ptr theObject) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -1665,7 +1638,6 @@ CORBA::Long SMESH_MeshEditor_i::Reorient2D(SMESH::SMESH_IDSource_ptr the2Dgroup, const SMESH::DirStruct& theDirection, CORBA::Long theFace, const SMESH::PointStruct& thePoint) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(/*deleteSearchers=*/false); @@ -1749,7 +1721,6 @@ CORBA::Long SMESH_MeshEditor_i::Reorient2D(SMESH::SMESH_IDSource_ptr the2Dgroup, CORBA::Long SMESH_MeshEditor_i::Reorient2DBy3D(const SMESH::ListOfIDSources& faceGroups, SMESH::SMESH_IDSource_ptr volumeGroup, CORBA::Boolean outsideNormal) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -1800,7 +1771,6 @@ CORBA::Long SMESH_MeshEditor_i::Reorient2DBy3D(const SMESH::ListOfIDSources& fac CORBA::Boolean SMESH_MeshEditor_i::TriToQuad (const SMESH::long_array & IDsOfElements, SMESH::NumericalFunctor_ptr Criterion, CORBA::Double MaxAngle) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -1849,7 +1819,6 @@ CORBA::Boolean SMESH_MeshEditor_i::TriToQuad (const SMESH::long_array & IDsOfE CORBA::Boolean SMESH_MeshEditor_i::TriToQuadObject (SMESH::SMESH_IDSource_ptr theObject, SMESH::NumericalFunctor_ptr Criterion, CORBA::Double MaxAngle) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -1883,7 +1852,6 @@ CORBA::Boolean SMESH_MeshEditor_i::TriToQuadObject (SMESH::SMESH_IDSource_ptr CORBA::Boolean SMESH_MeshEditor_i::QuadToTri (const SMESH::long_array & IDsOfElements, SMESH::NumericalFunctor_ptr Criterion) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -1921,7 +1889,6 @@ CORBA::Boolean SMESH_MeshEditor_i::QuadToTri (const SMESH::long_array & IDsOfE CORBA::Boolean SMESH_MeshEditor_i::QuadToTriObject (SMESH::SMESH_IDSource_ptr theObject, SMESH::NumericalFunctor_ptr Criterion) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -1953,7 +1920,6 @@ CORBA::Boolean SMESH_MeshEditor_i::QuadToTriObject (SMESH::SMESH_IDSource_ptr //================================================================================ void SMESH_MeshEditor_i::QuadTo4Tri (SMESH::SMESH_IDSource_ptr theObject) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -1979,7 +1945,6 @@ void SMESH_MeshEditor_i::QuadTo4Tri (SMESH::SMESH_IDSource_ptr theObject) CORBA::Boolean SMESH_MeshEditor_i::SplitQuad (const SMESH::long_array & IDsOfElements, CORBA::Boolean Diag13) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -2009,7 +1974,6 @@ CORBA::Boolean SMESH_MeshEditor_i::SplitQuad (const SMESH::long_array & IDsOfEle CORBA::Boolean SMESH_MeshEditor_i::SplitQuadObject (SMESH::SMESH_IDSource_ptr theObject, CORBA::Boolean Diag13) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -2044,7 +2008,6 @@ CORBA::Boolean SMESH_MeshEditor_i::SplitQuadObject (SMESH::SMESH_IDSource_ptr th CORBA::Long SMESH_MeshEditor_i::BestSplit (CORBA::Long IDOfQuad, SMESH::NumericalFunctor_ptr Criterion) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -2077,7 +2040,6 @@ CORBA::Long SMESH_MeshEditor_i::BestSplit (CORBA::Long IDOfQuad, void SMESH_MeshEditor_i::SplitVolumesIntoTetra (SMESH::SMESH_IDSource_ptr elems, CORBA::Short methodFlags) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -2115,7 +2077,6 @@ void SMESH_MeshEditor_i::SplitHexahedraIntoPrisms( SMESH::SMESH_IDSource_ptr el const SMESH::DirStruct& facetToSplitNormal, CORBA::Short methodFlags, CORBA::Boolean allDomains) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -2176,7 +2137,6 @@ void SMESH_MeshEditor_i::SplitHexahedraIntoPrisms( SMESH::SMESH_IDSource_ptr el //================================================================================ void SMESH_MeshEditor_i::SplitBiQuadraticIntoLinear(const SMESH::ListOfIDSources& theElems) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -2212,7 +2172,6 @@ SMESH_MeshEditor_i::Smooth(const SMESH::long_array & IDsOfElements, CORBA::Long MaxNbOfIterations, CORBA::Double MaxAspectRatio, SMESH::SMESH_MeshEditor::Smooth_Method Method) - throw (SALOME::SALOME_Exception) { return smooth( IDsOfElements, IDsOfFixedNodes, MaxNbOfIterations, MaxAspectRatio, Method, false ); @@ -2230,7 +2189,6 @@ SMESH_MeshEditor_i::SmoothParametric(const SMESH::long_array & IDsO CORBA::Long MaxNbOfIterations, CORBA::Double MaxAspectRatio, SMESH::SMESH_MeshEditor::Smooth_Method Method) - throw (SALOME::SALOME_Exception) { return smooth( IDsOfElements, IDsOfFixedNodes, MaxNbOfIterations, MaxAspectRatio, Method, true ); @@ -2248,7 +2206,6 @@ SMESH_MeshEditor_i::SmoothObject(SMESH::SMESH_IDSource_ptr theObjec CORBA::Long MaxNbOfIterations, CORBA::Double MaxAspectRatio, SMESH::SMESH_MeshEditor::Smooth_Method Method) - throw (SALOME::SALOME_Exception) { return smoothObject (theObject, IDsOfFixedNodes, MaxNbOfIterations, MaxAspectRatio, Method, false); @@ -2266,7 +2223,6 @@ SMESH_MeshEditor_i::SmoothParametricObject(SMESH::SMESH_IDSource_ptr CORBA::Long MaxNbOfIterations, CORBA::Double MaxAspectRatio, SMESH::SMESH_MeshEditor::Smooth_Method Method) - throw (SALOME::SALOME_Exception) { return smoothObject (theObject, IDsOfFixedNodes, MaxNbOfIterations, MaxAspectRatio, Method, true); @@ -2286,7 +2242,6 @@ SMESH_MeshEditor_i::smooth(const SMESH::long_array & IDsOfElements, CORBA::Double MaxAspectRatio, SMESH::SMESH_MeshEditor::Smooth_Method Method, bool IsParametric) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -2340,7 +2295,6 @@ SMESH_MeshEditor_i::smoothObject(SMESH::SMESH_IDSource_ptr theObjec CORBA::Double MaxAspectRatio, SMESH::SMESH_MeshEditor::Smooth_Method Method, bool IsParametric) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -2374,7 +2328,6 @@ SMESH_MeshEditor_i::smoothObject(SMESH::SMESH_IDSource_ptr theObjec //============================================================================= void SMESH_MeshEditor_i::RenumberNodes() - throw (SALOME::SALOME_Exception) { SMESH_TRY; // Update Python script @@ -2392,7 +2345,6 @@ void SMESH_MeshEditor_i::RenumberNodes() //============================================================================= void SMESH_MeshEditor_i::RenumberElements() - throw (SALOME::SALOME_Exception) { SMESH_TRY; // Update Python script @@ -2410,7 +2362,6 @@ void SMESH_MeshEditor_i::RenumberElements() //======================================================================= SMESH::ListOfGroups* SMESH_MeshEditor_i::getGroups(const std::list* groupIDs) - throw (SALOME::SALOME_Exception) { SMESH_TRY; if ( !groupIDs ) @@ -2436,7 +2387,6 @@ SMESH_MeshEditor_i::RotationSweepObjects(const SMESH::ListOfIDSources & theNodes CORBA::Long theNbOfSteps, CORBA::Double theTolerance, const bool theMakeGroups) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -2639,7 +2589,6 @@ SMESH_MeshEditor_i::ExtrusionSweepObjects(const SMESH::ListOfIDSources & theNode const SMESH::double_array & theBasePoint, const SMESH::double_array & theAngles, CORBA::Boolean theAnglesVariation) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -2722,7 +2671,6 @@ SMESH_MeshEditor_i::ExtrusionByNormal(const SMESH::ListOfIDSources& objects, CORBA::Boolean useInputElemsOnly, CORBA::Boolean makeGroups, CORBA::Short dim) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -2799,7 +2747,6 @@ SMESH_MeshEditor_i::AdvancedExtrusion(const SMESH::long_array & theIDsOfElements CORBA::Long theExtrFlags, CORBA::Double theSewTolerance, CORBA::Boolean theMakeGroups) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -2886,7 +2833,6 @@ SMESH_MeshEditor_i::ExtrusionAlongPathObjects(const SMESH::ListOfIDSources & the const SMESH::double_array & theScaleFactors, CORBA::Boolean theScalesVariation, SMESH::SMESH_MeshEditor::Extrusion_Error& theError) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -3111,7 +3057,6 @@ SMESH_MeshEditor_i::mirror(TIDSortedElemSet & theElements, CORBA::Boolean theCopy, bool theMakeGroups, ::SMESH_Mesh* theTargetMesh) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -3177,7 +3122,6 @@ void SMESH_MeshEditor_i::Mirror(const SMESH::long_array & theIDsOfElem const SMESH::AxisStruct & theAxis, SMESH::SMESH_MeshEditor::MirrorType theMirrorType, CORBA::Boolean theCopy) - throw (SALOME::SALOME_Exception) { if ( !myIsPreviewMode ) { TPythonDump() << this << ".Mirror( " @@ -3204,7 +3148,6 @@ void SMESH_MeshEditor_i::MirrorObject(SMESH::SMESH_IDSource_ptr theObj const SMESH::AxisStruct & theAxis, SMESH::SMESH_MeshEditor::MirrorType theMirrorType, CORBA::Boolean theCopy) - throw (SALOME::SALOME_Exception) { if ( !myIsPreviewMode ) { TPythonDump() << this << ".MirrorObject( " @@ -3230,7 +3173,6 @@ SMESH::ListOfGroups* SMESH_MeshEditor_i::MirrorMakeGroups(const SMESH::long_array& theIDsOfElements, const SMESH::AxisStruct& theMirror, SMESH::SMESH_MeshEditor::MirrorType theMirrorType) - throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() @@ -3260,7 +3202,6 @@ SMESH::ListOfGroups* SMESH_MeshEditor_i::MirrorObjectMakeGroups(SMESH::SMESH_IDSource_ptr theObject, const SMESH::AxisStruct& theMirror, SMESH::SMESH_MeshEditor::MirrorType theMirrorType) - throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() @@ -3291,7 +3232,6 @@ SMESH_MeshEditor_i::MirrorMakeMesh(const SMESH::long_array& theIDsOfE SMESH::SMESH_MeshEditor::MirrorType theMirrorType, CORBA::Boolean theCopyGroups, const char* theMeshName) - throw (SALOME::SALOME_Exception) { SMESH_Mesh_i* mesh_i; SMESH::SMESH_Mesh_var mesh; @@ -3339,7 +3279,6 @@ SMESH_MeshEditor_i::MirrorObjectMakeMesh(SMESH::SMESH_IDSource_ptr the SMESH::SMESH_MeshEditor::MirrorType theMirrorType, CORBA::Boolean theCopyGroups, const char* theMeshName) - throw (SALOME::SALOME_Exception) { SMESH_Mesh_i* mesh_i; SMESH::SMESH_Mesh_var mesh; @@ -3386,7 +3325,6 @@ SMESH_MeshEditor_i::translate(TIDSortedElemSet & theElements, CORBA::Boolean theCopy, bool theMakeGroups, ::SMESH_Mesh* theTargetMesh) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -3440,7 +3378,6 @@ SMESH_MeshEditor_i::translate(TIDSortedElemSet & theElements, void SMESH_MeshEditor_i::Translate(const SMESH::long_array & theIDsOfElements, const SMESH::DirStruct & theVector, CORBA::Boolean theCopy) - throw (SALOME::SALOME_Exception) { if (!myIsPreviewMode) { TPythonDump() << this << ".Translate( " @@ -3463,7 +3400,6 @@ void SMESH_MeshEditor_i::Translate(const SMESH::long_array & theIDsOfElements, void SMESH_MeshEditor_i::TranslateObject(SMESH::SMESH_IDSource_ptr theObject, const SMESH::DirStruct & theVector, CORBA::Boolean theCopy) - throw (SALOME::SALOME_Exception) { if (!myIsPreviewMode) { TPythonDump() << this << ".TranslateObject( " @@ -3487,7 +3423,6 @@ void SMESH_MeshEditor_i::TranslateObject(SMESH::SMESH_IDSource_ptr theObject, SMESH::ListOfGroups* SMESH_MeshEditor_i::TranslateMakeGroups(const SMESH::long_array& theIDsOfElements, const SMESH::DirStruct& theVector) - throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() @@ -3514,7 +3449,6 @@ SMESH_MeshEditor_i::TranslateMakeGroups(const SMESH::long_array& theIDsOfElement SMESH::ListOfGroups* SMESH_MeshEditor_i::TranslateObjectMakeGroups(SMESH::SMESH_IDSource_ptr theObject, const SMESH::DirStruct& theVector) - throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() @@ -3542,7 +3476,6 @@ SMESH_MeshEditor_i::TranslateMakeMesh(const SMESH::long_array& theIDsOfElements, const SMESH::DirStruct& theVector, CORBA::Boolean theCopyGroups, const char* theMeshName) - throw (SALOME::SALOME_Exception) { SMESH_Mesh_i* mesh_i; SMESH::SMESH_Mesh_var mesh; @@ -3589,7 +3522,6 @@ SMESH_MeshEditor_i::TranslateObjectMakeMesh(SMESH::SMESH_IDSource_ptr theObject, const SMESH::DirStruct& theVector, CORBA::Boolean theCopyGroups, const char* theMeshName) - throw (SALOME::SALOME_Exception) { SMESH_TRY; SMESH_Mesh_i* mesh_i; @@ -3639,7 +3571,6 @@ SMESH_MeshEditor_i::rotate(TIDSortedElemSet & theElements, CORBA::Boolean theCopy, bool theMakeGroups, ::SMESH_Mesh* theTargetMesh) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -3692,7 +3623,6 @@ void SMESH_MeshEditor_i::Rotate(const SMESH::long_array & theIDsOfElements, const SMESH::AxisStruct & theAxis, CORBA::Double theAngle, CORBA::Boolean theCopy) - throw (SALOME::SALOME_Exception) { if (!myIsPreviewMode) { TPythonDump() << this << ".Rotate( " @@ -3718,7 +3648,6 @@ void SMESH_MeshEditor_i::RotateObject(SMESH::SMESH_IDSource_ptr theObject, const SMESH::AxisStruct & theAxis, CORBA::Double theAngle, CORBA::Boolean theCopy) - throw (SALOME::SALOME_Exception) { if ( !myIsPreviewMode ) { TPythonDump() << this << ".RotateObject( " @@ -3742,7 +3671,6 @@ SMESH::ListOfGroups* SMESH_MeshEditor_i::RotateMakeGroups(const SMESH::long_array& theIDsOfElements, const SMESH::AxisStruct& theAxis, CORBA::Double theAngle) - throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() @@ -3772,7 +3700,6 @@ SMESH::ListOfGroups* SMESH_MeshEditor_i::RotateObjectMakeGroups(SMESH::SMESH_IDSource_ptr theObject, const SMESH::AxisStruct& theAxis, CORBA::Double theAngle) - throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() @@ -3802,7 +3729,6 @@ SMESH_MeshEditor_i::RotateMakeMesh(const SMESH::long_array& theIDsOfElements, CORBA::Double theAngleInRadians, CORBA::Boolean theCopyGroups, const char* theMeshName) - throw (SALOME::SALOME_Exception) { SMESH_TRY; SMESH::SMESH_Mesh_var mesh; @@ -3855,7 +3781,6 @@ SMESH_MeshEditor_i::RotateObjectMakeMesh(SMESH::SMESH_IDSource_ptr theObject, CORBA::Double theAngleInRadians, CORBA::Boolean theCopyGroups, const char* theMeshName) - throw (SALOME::SALOME_Exception) { SMESH_TRY; SMESH::SMESH_Mesh_var mesh; @@ -3908,7 +3833,6 @@ SMESH_MeshEditor_i::scale(SMESH::SMESH_IDSource_ptr theObject, CORBA::Boolean theCopy, bool theMakeGroups, ::SMESH_Mesh* theTargetMesh) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -3983,7 +3907,6 @@ void SMESH_MeshEditor_i::Scale(SMESH::SMESH_IDSource_ptr theObject, const SMESH::PointStruct& thePoint, const SMESH::double_array& theScaleFact, CORBA::Boolean theCopy) - throw (SALOME::SALOME_Exception) { if ( !myIsPreviewMode ) { TPythonDump() << this << ".Scale( " @@ -4005,7 +3928,6 @@ SMESH::ListOfGroups* SMESH_MeshEditor_i::ScaleMakeGroups(SMESH::SMESH_IDSource_ptr theObject, const SMESH::PointStruct& thePoint, const SMESH::double_array& theScaleFact) - throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() @@ -4032,7 +3954,6 @@ SMESH_MeshEditor_i::ScaleMakeMesh(SMESH::SMESH_IDSource_ptr theObject, const SMESH::double_array& theScaleFact, CORBA::Boolean theCopyGroups, const char* theMeshName) - throw (SALOME::SALOME_Exception) { SMESH_Mesh_i* mesh_i; SMESH::SMESH_Mesh_var mesh; @@ -4083,7 +4004,6 @@ SMESH::SMESH_Mesh_ptr SMESH_MeshEditor_i::Offset( SMESH::SMESH_IDSource_ptr theO CORBA::Boolean theCopyElements, const char* theMeshName, SMESH::ListOfGroups_out theGroups) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -4197,7 +4117,6 @@ void SMESH_MeshEditor_i:: FindCoincidentNodes (CORBA::Double Tolerance, SMESH::array_of_long_array_out GroupsOfNodes, CORBA::Boolean SeparateCornersAndMedium) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -4222,7 +4141,6 @@ FindCoincidentNodesOnPart(SMESH::SMESH_IDSource_ptr theObject, CORBA::Double Tolerance, SMESH::array_of_long_array_out GroupsOfNodes, CORBA::Boolean SeparateCornersAndMedium) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -4254,7 +4172,6 @@ FindCoincidentNodesOnPartBut(const SMESH::ListOfIDSources& theObjects, SMESH::array_of_long_array_out theGroupsOfNodes, const SMESH::ListOfIDSources& theExceptSubMeshOrGroups, CORBA::Boolean theSeparateCornersAndMedium) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -4291,7 +4208,6 @@ FindCoincidentNodesOnPartBut(const SMESH::ListOfIDSources& theObjects, void SMESH_MeshEditor_i::MergeNodes (const SMESH::array_of_long_array& GroupsOfNodes, const SMESH::ListOfIDSources& NodesToKeep, CORBA::Boolean AvoidMakingHoles) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -4351,7 +4267,6 @@ void SMESH_MeshEditor_i::MergeNodes (const SMESH::array_of_long_array& GroupsOfN void SMESH_MeshEditor_i::FindEqualElements(const SMESH::ListOfIDSources& theObjects, const SMESH::ListOfIDSources& theExceptObjects, SMESH::array_of_long_array_out theGroupsOfElementsID) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -4411,7 +4326,6 @@ void SMESH_MeshEditor_i::FindEqualElements(const SMESH::ListOfIDSources& theObj void SMESH_MeshEditor_i::MergeElements(const SMESH::array_of_long_array& theGroupsOfElementsID, const SMESH::ListOfIDSources& theElementsToKeep) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -4466,7 +4380,6 @@ void SMESH_MeshEditor_i::MergeElements(const SMESH::array_of_long_array& theGrou //======================================================================= void SMESH_MeshEditor_i::MergeEqualElements() - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -4490,7 +4403,6 @@ CORBA::Boolean SMESH_MeshEditor_i::MoveNode(CORBA::Long NodeID, CORBA::Double x, CORBA::Double y, CORBA::Double z) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(/*deleteSearchers=*/false); @@ -4547,7 +4459,6 @@ CORBA::Boolean SMESH_MeshEditor_i::MoveNode(CORBA::Long NodeID, CORBA::Long SMESH_MeshEditor_i::FindNodeClosestTo(CORBA::Double x, CORBA::Double y, CORBA::Double z) - throw (SALOME::SALOME_Exception) { SMESH_TRY; theSearchersDeleter.Set( myMesh ); // remove theNodeSearcher if mesh is other @@ -4574,7 +4485,6 @@ CORBA::Long SMESH_MeshEditor_i::MoveClosestNodeToPoint(CORBA::Double x, CORBA::Double y, CORBA::Double z, CORBA::Long theNodeID) - throw (SALOME::SALOME_Exception) { SMESH_TRY; // We keep theNodeSearcher until any mesh modification: @@ -4652,7 +4562,6 @@ SMESH::long_array* SMESH_MeshEditor_i::FindElementsByPoint(CORBA::Double x, CORBA::Double y, CORBA::Double z, SMESH::ElementType type) - throw (SALOME::SALOME_Exception) { SMESH_TRY; SMESH::long_array_var res = new SMESH::long_array; @@ -4688,7 +4597,6 @@ SMESH_MeshEditor_i::FindAmongElementsByPoint(SMESH::SMESH_IDSource_ptr elementID CORBA::Double y, CORBA::Double z, SMESH::ElementType type) - throw (SALOME::SALOME_Exception) { SMESH_TRY; SMESH::long_array_var res = new SMESH::long_array; @@ -4761,7 +4669,6 @@ CORBA::Long SMESH_MeshEditor_i::ProjectPoint(CORBA::Double x, SMESH::ElementType type, SMESH::SMESH_IDSource_ptr meshObject, SMESH::double_array_out projecton) - throw (SALOME::SALOME_Exception) { if ( CORBA::is_nil( meshObject )) THROW_SALOME_CORBA_EXCEPTION("NULL meshObject", SALOME::BAD_PARAM); @@ -4822,7 +4729,6 @@ CORBA::Long SMESH_MeshEditor_i::ProjectPoint(CORBA::Double x, CORBA::Short SMESH_MeshEditor_i::GetPointState(CORBA::Double x, CORBA::Double y, CORBA::Double z) - throw (SALOME::SALOME_Exception) { SMESH_TRY; theSearchersDeleter.Set( myMesh ); @@ -4841,7 +4747,6 @@ CORBA::Short SMESH_MeshEditor_i::GetPointState(CORBA::Double x, //======================================================================= CORBA::Boolean SMESH_MeshEditor_i::IsManifold() - throw (SALOME::SALOME_Exception) { bool isManifold = true; @@ -4862,7 +4767,6 @@ CORBA::Boolean SMESH_MeshEditor_i::IsManifold() //======================================================================= CORBA::Boolean SMESH_MeshEditor_i::IsCoherentOrientation2D() - throw (SALOME::SALOME_Exception) { bool isGoodOri = true; @@ -4891,7 +4795,6 @@ SMESH::array_of_long_array* SMESH_MeshEditor_i::Get1DBranches( SMESH::SMESH_IDSource_ptr theEdges, CORBA::Long theStartNode, SMESH::array_of_long_array_out theNodeGroups ) - throw (SALOME::SALOME_Exception) { if ( CORBA::is_nil( theEdges )) THROW_SALOME_CORBA_EXCEPTION("Get1DBranches(): NULL group given", SALOME::BAD_PARAM); @@ -4938,7 +4841,6 @@ SMESH_MeshEditor_i::Get1DBranches( SMESH::SMESH_IDSource_ptr theEdges, SMESH::ListOfEdges* SMESH_MeshEditor_i::FindSharpEdges(CORBA::Double theAngle, CORBA::Boolean theAddExisting) - throw (SALOME::SALOME_Exception) { SMESH::ListOfEdges_var resultEdges = new SMESH::ListOfEdges; SMESH_TRY; @@ -4989,7 +4891,6 @@ SMESH::ListOfEdges* SMESH_MeshEditor_i::FindSharpEdges(CORBA::Double theAngle, //======================================================================= SMESH::ListOfFreeBorders* SMESH_MeshEditor_i::FindFreeBorders(CORBA::Boolean closedOnly) - throw (SALOME::SALOME_Exception) { SMESH::ListOfFreeBorders_var resBorders = new SMESH::ListOfFreeBorders; SMESH_TRY; @@ -5020,7 +4921,6 @@ SMESH::ListOfFreeBorders* SMESH_MeshEditor_i::FindFreeBorders(CORBA::Boolean clo SMESH::SMESH_Group_ptr SMESH_MeshEditor_i::FillHole(const SMESH::FreeBorder& theHole, const char* theGroupName) - throw (SALOME::SALOME_Exception) { initData(); @@ -5216,7 +5116,6 @@ CORBA::Short SMESH_MeshEditor_i:: SewCoincidentFreeBorders(const SMESH::CoincidentFreeBorders& freeBorders, CORBA::Boolean createPolygons, CORBA::Boolean createPolyhedra) - throw (SALOME::SALOME_Exception) { CORBA::Short nbSewed = 0; @@ -5385,7 +5284,6 @@ SMESH_MeshEditor_i::SewFreeBorders(CORBA::Long FirstNodeID1, CORBA::Long LastNodeID2, CORBA::Boolean CreatePolygons, CORBA::Boolean CreatePolyedrs) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -5449,7 +5347,6 @@ SMESH_MeshEditor_i::SewConformFreeBorders(CORBA::Long FirstNodeID1, CORBA::Long LastNodeID1, CORBA::Long FirstNodeID2, CORBA::Long SecondNodeID2) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -5509,7 +5406,6 @@ SMESH_MeshEditor_i::SewBorderToSide(CORBA::Long FirstNodeIDOnFreeBorder, CORBA::Long LastNodeIDOnSide, CORBA::Boolean CreatePolygons, CORBA::Boolean CreatePolyedrs) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -5571,7 +5467,6 @@ SMESH_MeshEditor_i::SewSideElements(const SMESH::long_array& IDsOfSide1Elements, CORBA::Long NodeID1OfSide2ToMerge, CORBA::Long NodeID2OfSide1ToMerge, CORBA::Long NodeID2OfSide2ToMerge) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -5627,7 +5522,6 @@ SMESH_MeshEditor_i::SewSideElements(const SMESH::long_array& IDsOfSide1Elements, CORBA::Boolean SMESH_MeshEditor_i::ChangeElemNodes(CORBA::Long ide, const SMESH::long_array& newIDs) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -5665,7 +5559,6 @@ CORBA::Boolean SMESH_MeshEditor_i::ChangeElemNodes(CORBA::Long ide, void SMESH_MeshEditor_i::convertToQuadratic(CORBA::Boolean theForce3d, CORBA::Boolean theToBiQuad, SMESH::SMESH_IDSource_ptr theObject) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -5697,7 +5590,6 @@ void SMESH_MeshEditor_i::convertToQuadratic(CORBA::Boolean theForce3d //======================================================================= CORBA::Boolean SMESH_MeshEditor_i::ConvertFromQuadratic() - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -5717,7 +5609,6 @@ CORBA::Boolean SMESH_MeshEditor_i::ConvertFromQuadratic() //======================================================================= void SMESH_MeshEditor_i::ConvertToQuadratic(CORBA::Boolean theForce3d) - throw (SALOME::SALOME_Exception) { convertToQuadratic( theForce3d, false ); TPythonDump() << this << ".ConvertToQuadratic("<GetType() != SMESH::NODE ) @@ -6131,7 +6015,6 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeGroup(SMESH::SMESH_GroupBase_ptr th SMESH::SMESH_Group_ptr SMESH_MeshEditor_i::DoubleNodeGroupNew( SMESH::SMESH_GroupBase_ptr theNodes, SMESH::SMESH_GroupBase_ptr theModifiedElems ) - throw (SALOME::SALOME_Exception) { SMESH_TRY; SMESH::SMESH_Group_var aNewGroup; @@ -6187,7 +6070,6 @@ SMESH_MeshEditor_i::DoubleNodeGroupNew( SMESH::SMESH_GroupBase_ptr theNodes, CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeGroups(const SMESH::ListOfGroups& theNodes, const SMESH::ListOfGroups& theModifiedElems ) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -6243,7 +6125,6 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeGroups(const SMESH::ListOfGroups& t SMESH::SMESH_Group_ptr SMESH_MeshEditor_i::DoubleNodeGroupsNew( const SMESH::ListOfGroups& theNodes, const SMESH::ListOfGroups& theModifiedElems ) - throw (SALOME::SALOME_Exception) { SMESH::SMESH_Group_var aNewGroup; @@ -6287,7 +6168,6 @@ SMESH_MeshEditor_i::DoubleNodeGroupsNew( const SMESH::ListOfGroups& theNodes, CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeElem( const SMESH::long_array& theElems, const SMESH::long_array& theNodesNot, const SMESH::long_array& theAffectedElems ) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -6328,7 +6208,6 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeElem( const SMESH::long_array& theE CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeElemInRegion ( const SMESH::long_array& theElems, const SMESH::long_array& theNodesNot, GEOM::GEOM_Object_ptr theShape ) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -6369,7 +6248,6 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeElemGroup(SMESH::SMESH_GroupBase_ptr theElems, SMESH::SMESH_GroupBase_ptr theNodesNot, SMESH::SMESH_GroupBase_ptr theAffectedElems) - throw (SALOME::SALOME_Exception) { SMESH_TRY; if ( CORBA::is_nil( theElems ) && theElems->GetType() == SMESH::NODE ) @@ -6414,7 +6292,6 @@ SMESH::SMESH_Group_ptr SMESH_MeshEditor_i::DoubleNodeElemGroupNew(SMESH::SMESH_GroupBase_ptr theElems, SMESH::SMESH_GroupBase_ptr theNodesNot, SMESH::SMESH_GroupBase_ptr theAffectedElems) - throw (SALOME::SALOME_Exception) { TPythonDump pyDump; SMESH::ListOfGroups_var twoGroups = DoubleNodeElemGroup2New( theElems, @@ -6451,7 +6328,6 @@ SMESH_MeshEditor_i::DoubleNodeElemGroup2New(SMESH::SMESH_GroupBase_ptr theElems, SMESH::SMESH_GroupBase_ptr theAffectedElems, CORBA::Boolean theElemGroupNeeded, CORBA::Boolean theNodeGroupNeeded) - throw (SALOME::SALOME_Exception) { SMESH_TRY; SMESH::SMESH_Group_var aNewElemGroup, aNewNodeGroup; @@ -6536,7 +6412,6 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeElemGroupInRegion(SMESH::SMESH_GroupBase_ptr theElems, SMESH::SMESH_GroupBase_ptr theNodesNot, GEOM::GEOM_Object_ptr theShape ) - throw (SALOME::SALOME_Exception) { SMESH_TRY; if ( CORBA::is_nil( theElems ) && theElems->GetType() == SMESH::NODE ) @@ -6609,7 +6484,6 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeElemGroups(const SMESH::ListOfGroups& theElems, const SMESH::ListOfGroups& theNodesNot, const SMESH::ListOfGroups& theAffectedElems) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -6651,7 +6525,6 @@ SMESH::SMESH_Group_ptr SMESH_MeshEditor_i::DoubleNodeElemGroupsNew(const SMESH::ListOfGroups& theElems, const SMESH::ListOfGroups& theNodesNot, const SMESH::ListOfGroups& theAffectedElems) - throw (SALOME::SALOME_Exception) { TPythonDump pyDump; SMESH::ListOfGroups_var twoGroups = DoubleNodeElemGroups2New( theElems, @@ -6688,7 +6561,6 @@ SMESH_MeshEditor_i::DoubleNodeElemGroups2New(const SMESH::ListOfGroups& theElems const SMESH::ListOfGroups& theAffectedElems, CORBA::Boolean theElemGroupNeeded, CORBA::Boolean theNodeGroupNeeded) - throw (SALOME::SALOME_Exception) { SMESH_TRY; SMESH::SMESH_Group_var aNewElemGroup, aNewNodeGroup; @@ -6769,7 +6641,6 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeElemGroupsInRegion(const SMESH::ListOfGroups& theElems, const SMESH::ListOfGroups& theNodesNot, GEOM::GEOM_Object_ptr theShape ) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -6812,7 +6683,6 @@ SMESH::ListOfGroups* SMESH_MeshEditor_i::AffectedElemGroupsInRegion( const SMESH::ListOfGroups& theElems, const SMESH::ListOfGroups& theNodesNot, GEOM::GEOM_Object_ptr theShape ) - throw (SALOME::SALOME_Exception) { SMESH_TRY; SMESH::ListOfGroups_var aListOfGroups = new SMESH::ListOfGroups(); @@ -6912,7 +6782,6 @@ SMESH_MeshEditor_i::AffectedElemGroupsInRegion( const SMESH::ListOfGroups& theEl //================================================================================ CORBA::Boolean SMESH_MeshEditor_i::Make2DMeshFrom3D() - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -6954,7 +6823,6 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodesOnGroupBoundaries( const SMESH::ListOfGroups& theDomains, CORBA::Boolean createJointElems, CORBA::Boolean onAllBoundaries ) - throw (SALOME::SALOME_Exception) { bool isOK = false; @@ -7012,7 +6880,6 @@ SMESH_MeshEditor_i::DoubleNodesOnGroupBoundaries( const SMESH::ListOfGroups& the CORBA::Boolean SMESH_MeshEditor_i::CreateFlatElementsOnFacesGroups( const SMESH::ListOfGroups& theGroupsOfFaces ) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -7065,7 +6932,6 @@ void SMESH_MeshEditor_i::CreateHoleSkin(CORBA::Double radius, const char* groupName, const SMESH::double_array& theNodesCoords, SMESH::array_of_long_array_out GroupsOfNodes) - throw (SALOME::SALOME_Exception) { SMESH_TRY; @@ -7133,7 +6999,6 @@ SMESH_MeshEditor_i::MakeBoundaryMesh(SMESH::SMESH_IDSource_ptr idSource, CORBA::Boolean toCopyElements, CORBA::Boolean toCopyExistingBondary, SMESH::SMESH_Group_out group) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -7230,7 +7095,6 @@ CORBA::Long SMESH_MeshEditor_i::MakeBoundaryElements(SMESH::Bnd_Dimension dim, const SMESH::ListOfIDSources& groups, SMESH::SMESH_Mesh_out mesh, SMESH::SMESH_Group_out group) - throw (SALOME::SALOME_Exception) { SMESH_TRY; initData(); @@ -7385,7 +7249,6 @@ CORBA::Long SMESH_MeshEditor_i::MakeBoundaryElements(SMESH::Bnd_Dimension dim, void SMESH_MeshEditor_i::MakePolyLine(SMESH::ListOfPolySegments& theSegments, const char* theGroupName) - throw (SALOME::SALOME_Exception) { if ( theSegments.length() == 0 ) THROW_SALOME_CORBA_EXCEPTION("No segments given", SALOME::BAD_PARAM ); @@ -7511,7 +7374,6 @@ void SMESH_MeshEditor_i::MakePolyLine(SMESH::ListOfPolySegments& theSegments, SMESH::ListOfEdges* SMESH_MeshEditor_i::MakeSlot(SMESH::SMESH_GroupBase_ptr theSegments, CORBA::Double theWidth) - throw (SALOME::SALOME_Exception) { if ( CORBA::is_nil( theSegments ) || theSegments->GetType() != SMESH::EDGE ) diff --git a/src/SMESH_I/SMESH_MeshEditor_i.hxx b/src/SMESH_I/SMESH_MeshEditor_i.hxx index f14c06b5f..b0b9dd270 100644 --- a/src/SMESH_I/SMESH_MeshEditor_i.hxx +++ b/src/SMESH_I/SMESH_MeshEditor_i.hxx @@ -65,27 +65,27 @@ public: /*! * Return data of mesh edition preview */ - SMESH::MeshPreviewStruct* GetPreviewData() throw (SALOME::SALOME_Exception); + SMESH::MeshPreviewStruct* GetPreviewData(); /*! * If during last operation of MeshEditor some nodes were * created this method returns list of their IDs, if new nodes * not created - returns an empty list */ - SMESH::long_array* GetLastCreatedNodes() throw (SALOME::SALOME_Exception); + SMESH::long_array* GetLastCreatedNodes(); /*! * If during last operation of MeshEditor some elements were * created this method returns list of their IDs, if new elements * not created - returns an empty list */ - SMESH::long_array* GetLastCreatedElems() throw (SALOME::SALOME_Exception); + SMESH::long_array* GetLastCreatedElems(); /*! * \brief Clears sequences of last created elements and nodes */ - void ClearLastCreated() throw (SALOME::SALOME_Exception); + void ClearLastCreated(); /*! * \brief Returns description of an error/warning occurred during the last operation */ - SMESH::ComputeError* GetLastError() throw (SALOME::SALOME_Exception); + SMESH::ComputeError* GetLastError(); /*! * \brief Wrap a sequence of ids in a SMESH_IDSource @@ -100,38 +100,25 @@ public: */ std::string GenerateGroupName(const std::string& thePrefix); - CORBA::Boolean RemoveElements(const SMESH::long_array & IDsOfElements) - throw (SALOME::SALOME_Exception); - CORBA::Boolean RemoveNodes (const SMESH::long_array & IDsOfNodes) - throw (SALOME::SALOME_Exception); - CORBA::Long RemoveOrphanNodes() - throw (SALOME::SALOME_Exception); + CORBA::Boolean RemoveElements(const SMESH::long_array & IDsOfElements); + CORBA::Boolean RemoveNodes (const SMESH::long_array & IDsOfNodes); + CORBA::Long RemoveOrphanNodes(); /*! * Methods for creation new elements. * Returns ID of created element or 0 if element not created */ - CORBA::Long AddNode(CORBA::Double x, CORBA::Double y, CORBA::Double z) - throw (SALOME::SALOME_Exception); - CORBA::Long Add0DElement(CORBA::Long IDOfNode, CORBA::Boolean DuplicateElements) - throw (SALOME::SALOME_Exception); - CORBA::Long AddBall(CORBA::Long IDOfNodem, CORBA::Double diameter) - throw (SALOME::SALOME_Exception); - CORBA::Long AddEdge(const SMESH::long_array & IDsOfNodes) - throw (SALOME::SALOME_Exception); - CORBA::Long AddFace(const SMESH::long_array & IDsOfNodes) - throw (SALOME::SALOME_Exception); - CORBA::Long AddPolygonalFace(const SMESH::long_array & IDsOfNodes) - throw (SALOME::SALOME_Exception); - CORBA::Long AddQuadPolygonalFace(const SMESH::long_array & IDsOfNodes) - throw (SALOME::SALOME_Exception); - CORBA::Long AddVolume(const SMESH::long_array & IDsOfNodes) - throw (SALOME::SALOME_Exception); + CORBA::Long AddNode(CORBA::Double x, CORBA::Double y, CORBA::Double z); + CORBA::Long Add0DElement(CORBA::Long IDOfNode, CORBA::Boolean DuplicateElements); + CORBA::Long AddBall(CORBA::Long IDOfNodem, CORBA::Double diameter); + CORBA::Long AddEdge(const SMESH::long_array & IDsOfNodes); + CORBA::Long AddFace(const SMESH::long_array & IDsOfNodes); + CORBA::Long AddPolygonalFace(const SMESH::long_array & IDsOfNodes); + CORBA::Long AddQuadPolygonalFace(const SMESH::long_array & IDsOfNodes); + CORBA::Long AddVolume(const SMESH::long_array & IDsOfNodes); CORBA::Long AddPolyhedralVolume(const SMESH::long_array & IDsOfNodes, - const SMESH::long_array & Quantities) - throw (SALOME::SALOME_Exception); - CORBA::Long AddPolyhedralVolumeByFaces(const SMESH::long_array & IdsOfFaces) - throw (SALOME::SALOME_Exception); + const SMESH::long_array & Quantities); + CORBA::Long AddPolyhedralVolumeByFaces(const SMESH::long_array & IdsOfFaces); /*! * \brief Create 0D elements on all nodes of the given object except those @@ -145,16 +132,14 @@ public: */ SMESH::SMESH_IDSource_ptr Create0DElementsOnAllNodes(SMESH::SMESH_IDSource_ptr theObject, const char* theGroupName, - CORBA::Boolean theDuplicateElements) - throw (SALOME::SALOME_Exception); + CORBA::Boolean theDuplicateElements); /*! * \brief Bind a node to a vertex * \param NodeID - node ID * \param VertexID - vertex ID available through GEOM_Object.GetSubShapeIndices()[0] */ - void SetNodeOnVertex(CORBA::Long NodeID, CORBA::Long VertexID) - throw (SALOME::SALOME_Exception); + void SetNodeOnVertex(CORBA::Long NodeID, CORBA::Long VertexID); /*! * \brief Store node position on an edge * \param NodeID - node ID @@ -162,8 +147,7 @@ public: * \param paramOnEdge - parameter on edge where the node is located */ void SetNodeOnEdge(CORBA::Long NodeID, CORBA::Long EdgeID, - CORBA::Double paramOnEdge) - throw (SALOME::SALOME_Exception); + CORBA::Double paramOnEdge); /*! * \brief Store node position on a face * \param NodeID - node ID @@ -172,36 +156,28 @@ public: * \param v - V parameter on face where the node is located */ void SetNodeOnFace(CORBA::Long NodeID, CORBA::Long FaceID, - CORBA::Double u, CORBA::Double v) - throw (SALOME::SALOME_Exception); + CORBA::Double u, CORBA::Double v); /*! * \brief Bind a node to a solid * \param NodeID - node ID * \param SolidID - vertex ID available through GEOM_Object.GetSubShapeIndices()[0] */ - void SetNodeInVolume(CORBA::Long NodeID, CORBA::Long SolidID) - throw (SALOME::SALOME_Exception); + void SetNodeInVolume(CORBA::Long NodeID, CORBA::Long SolidID); /*! * \brief Bind an element to a shape * \param ElementID - element ID * \param ShapeID - shape ID available through GEOM_Object.GetSubShapeIndices()[0] */ - void SetMeshElementOnShape(CORBA::Long ElementID, CORBA::Long ShapeID) - throw (SALOME::SALOME_Exception); + void SetMeshElementOnShape(CORBA::Long ElementID, CORBA::Long ShapeID); CORBA::Boolean MoveNode(CORBA::Long NodeID, - CORBA::Double x, CORBA::Double y, CORBA::Double z) - throw (SALOME::SALOME_Exception); + CORBA::Double x, CORBA::Double y, CORBA::Double z); - CORBA::Boolean InverseDiag(CORBA::Long NodeID1, CORBA::Long NodeID2) - throw (SALOME::SALOME_Exception); - CORBA::Boolean DeleteDiag(CORBA::Long NodeID1, CORBA::Long NodeID2) - throw (SALOME::SALOME_Exception); - CORBA::Boolean Reorient(const SMESH::long_array & IDsOfElements) - throw (SALOME::SALOME_Exception); - CORBA::Boolean ReorientObject(SMESH::SMESH_IDSource_ptr theObject) - throw (SALOME::SALOME_Exception); + CORBA::Boolean InverseDiag(CORBA::Long NodeID1, CORBA::Long NodeID2); + CORBA::Boolean DeleteDiag(CORBA::Long NodeID1, CORBA::Long NodeID2); + CORBA::Boolean Reorient(const SMESH::long_array & IDsOfElements); + CORBA::Boolean ReorientObject(SMESH::SMESH_IDSource_ptr theObject); /*! * \brief Reorient faces contained in \a the2Dgroup. @@ -215,7 +191,7 @@ public: CORBA::Long Reorient2D(SMESH::SMESH_IDSource_ptr the2Dgroup, const SMESH::DirStruct& theDirection, CORBA::Long theFace, - const SMESH::PointStruct& thePoint) throw (SALOME::SALOME_Exception); + const SMESH::PointStruct& thePoint); /*! * \brief Reorient faces basing on orientation of adjacent volumes. * \param faces - a list of objects containing face to reorient @@ -226,101 +202,78 @@ public: */ CORBA::Long Reorient2DBy3D(const SMESH::ListOfIDSources & faces, SMESH::SMESH_IDSource_ptr volumes, - CORBA::Boolean outsideNormal) - throw (SALOME::SALOME_Exception); + CORBA::Boolean outsideNormal); // Split/Join CORBA::Boolean TriToQuad (const SMESH::long_array & IDsOfElements, SMESH::NumericalFunctor_ptr Criterion, - CORBA::Double MaxAngle) - throw (SALOME::SALOME_Exception); + CORBA::Double MaxAngle); CORBA::Boolean TriToQuadObject (SMESH::SMESH_IDSource_ptr theObject, SMESH::NumericalFunctor_ptr Criterion, - CORBA::Double MaxAngle) - throw (SALOME::SALOME_Exception); + CORBA::Double MaxAngle); CORBA::Boolean QuadToTri (const SMESH::long_array & IDsOfElements, - SMESH::NumericalFunctor_ptr Criterion) - throw (SALOME::SALOME_Exception); + SMESH::NumericalFunctor_ptr Criterion); CORBA::Boolean QuadToTriObject (SMESH::SMESH_IDSource_ptr theObject, - SMESH::NumericalFunctor_ptr Criterion) - throw (SALOME::SALOME_Exception); - void QuadTo4Tri (SMESH::SMESH_IDSource_ptr theObject) - throw (SALOME::SALOME_Exception); + SMESH::NumericalFunctor_ptr Criterion); + void QuadTo4Tri (SMESH::SMESH_IDSource_ptr theObject); CORBA::Boolean SplitQuad (const SMESH::long_array & IDsOfElements, - CORBA::Boolean Diag13) - throw (SALOME::SALOME_Exception); + CORBA::Boolean Diag13); CORBA::Boolean SplitQuadObject (SMESH::SMESH_IDSource_ptr theObject, - CORBA::Boolean Diag13) - throw (SALOME::SALOME_Exception); + CORBA::Boolean Diag13); CORBA::Long BestSplit (CORBA::Long IDOfQuad, - SMESH::NumericalFunctor_ptr Criterion) - throw (SALOME::SALOME_Exception); + SMESH::NumericalFunctor_ptr Criterion); void SplitVolumesIntoTetra(SMESH::SMESH_IDSource_ptr elems, - CORBA::Short methodFlags) - throw (SALOME::SALOME_Exception); + CORBA::Short methodFlags); void SplitHexahedraIntoPrisms(SMESH::SMESH_IDSource_ptr elems, const SMESH::PointStruct & startHexPoint, const SMESH::DirStruct& facetToSplitNormal, CORBA::Short methodFlags, - CORBA::Boolean allDomains) - throw (SALOME::SALOME_Exception); - void SplitBiQuadraticIntoLinear(const SMESH::ListOfIDSources& elems) - throw (SALOME::SALOME_Exception); + CORBA::Boolean allDomains); + void SplitBiQuadraticIntoLinear(const SMESH::ListOfIDSources& elems); CORBA::Boolean Smooth(const SMESH::long_array & IDsOfElements, const SMESH::long_array & IDsOfFixedNodes, CORBA::Long MaxNbOfIterations, CORBA::Double MaxAspectRatio, - SMESH::SMESH_MeshEditor::Smooth_Method Method) - throw (SALOME::SALOME_Exception); + SMESH::SMESH_MeshEditor::Smooth_Method Method); CORBA::Boolean SmoothObject(SMESH::SMESH_IDSource_ptr theObject, const SMESH::long_array & IDsOfFixedNodes, CORBA::Long MaxNbOfIterations, CORBA::Double MaxAspectRatio, - SMESH::SMESH_MeshEditor::Smooth_Method Method) - throw (SALOME::SALOME_Exception); + SMESH::SMESH_MeshEditor::Smooth_Method Method); CORBA::Boolean SmoothParametric(const SMESH::long_array & IDsOfElements, const SMESH::long_array & IDsOfFixedNodes, CORBA::Long MaxNbOfIterations, CORBA::Double MaxAspectRatio, - SMESH::SMESH_MeshEditor::Smooth_Method Method) - throw (SALOME::SALOME_Exception); + SMESH::SMESH_MeshEditor::Smooth_Method Method) ; CORBA::Boolean SmoothParametricObject(SMESH::SMESH_IDSource_ptr theObject, const SMESH::long_array & IDsOfFixedNodes, CORBA::Long MaxNbOfIterations, CORBA::Double MaxAspectRatio, - SMESH::SMESH_MeshEditor::Smooth_Method Method) - throw (SALOME::SALOME_Exception); + SMESH::SMESH_MeshEditor::Smooth_Method Method); CORBA::Boolean smooth(const SMESH::long_array & IDsOfElements, const SMESH::long_array & IDsOfFixedNodes, CORBA::Long MaxNbOfIterations, CORBA::Double MaxAspectRatio, SMESH::SMESH_MeshEditor::Smooth_Method Method, - bool IsParametric) - throw (SALOME::SALOME_Exception); + bool IsParametric); CORBA::Boolean smoothObject(SMESH::SMESH_IDSource_ptr theObject, const SMESH::long_array & IDsOfFixedNodes, CORBA::Long MaxNbOfIterations, CORBA::Double MaxAspectRatio, SMESH::SMESH_MeshEditor::Smooth_Method Method, - bool IsParametric) - throw (SALOME::SALOME_Exception); + bool IsParametric); - CORBA::Boolean ConvertFromQuadratic() - throw (SALOME::SALOME_Exception); - void ConvertFromQuadraticObject(SMESH::SMESH_IDSource_ptr theObject) - throw (SALOME::SALOME_Exception); - void ConvertToQuadratic(CORBA::Boolean Force3d) - throw (SALOME::SALOME_Exception); + CORBA::Boolean ConvertFromQuadratic(); + void ConvertFromQuadraticObject(SMESH::SMESH_IDSource_ptr theObject); + void ConvertToQuadratic(CORBA::Boolean Force3d); void ConvertToQuadraticObject(CORBA::Boolean theForce3d, - SMESH::SMESH_IDSource_ptr theObject) - throw (SALOME::SALOME_Exception); + SMESH::SMESH_IDSource_ptr theObject); void ConvertToBiQuadratic(CORBA::Boolean theForce3d, - SMESH::SMESH_IDSource_ptr theObject) - throw (SALOME::SALOME_Exception); + SMESH::SMESH_IDSource_ptr theObject); - void RenumberNodes() throw (SALOME::SALOME_Exception); - void RenumberElements() throw (SALOME::SALOME_Exception); + void RenumberNodes(); + void RenumberElements(); SMESH::ListOfGroups* RotationSweepObjects(const SMESH::ListOfIDSources & Nodes, const SMESH::ListOfIDSources & Edges, @@ -329,8 +282,7 @@ public: CORBA::Double AngleInRadians, CORBA::Long NbOfSteps, CORBA::Double Tolerance, - CORBA::Boolean ToMakeGroups) - throw (SALOME::SALOME_Exception); + CORBA::Boolean ToMakeGroups); SMESH::ListOfGroups* ExtrusionSweepObjects(const SMESH::ListOfIDSources & Nodes, const SMESH::ListOfIDSources & Edges, @@ -342,8 +294,7 @@ public: CORBA::Boolean ScalesVariation, const SMESH::double_array & BasePoint, const SMESH::double_array & Angles, - CORBA::Boolean AnglesVariation) - throw (SALOME::SALOME_Exception); + CORBA::Boolean AnglesVariation); SMESH::ListOfGroups* ExtrusionByNormal(const SMESH::ListOfIDSources& objects, CORBA::Double stepSize, @@ -351,15 +302,13 @@ public: CORBA::Boolean byAverageNormal, CORBA::Boolean useInputElemsOnly, CORBA::Boolean makeGroups, - CORBA::Short dim) - throw (SALOME::SALOME_Exception); + CORBA::Short dim); SMESH::ListOfGroups* AdvancedExtrusion(const SMESH::long_array & theIDsOfElements, const SMESH::DirStruct & theStepVector, CORBA::Long theNbOfSteps, CORBA::Long theExtrFlags, CORBA::Double theSewTolerance, - CORBA::Boolean theMakeGroups) - throw (SALOME::SALOME_Exception); + CORBA::Boolean theMakeGroups); SMESH::ListOfGroups* ExtrusionAlongPathObjects(const SMESH::ListOfIDSources & Nodes, @@ -376,8 +325,7 @@ public: bool MakeGroups, const SMESH::double_array & ScaleFactors, CORBA::Boolean ScalesVariation, - SMESH::SMESH_MeshEditor::Extrusion_Error& Error) - throw (SALOME::SALOME_Exception); + SMESH::SMESH_MeshEditor::Extrusion_Error& Error); SMESH::double_array* LinearAnglesVariation(SMESH::SMESH_Mesh_ptr PathMesh, GEOM::GEOM_Object_ptr PathShape, @@ -386,156 +334,125 @@ public: void Mirror(const SMESH::long_array & IDsOfElements, const SMESH::AxisStruct & Axis, SMESH::SMESH_MeshEditor::MirrorType MirrorType, - CORBA::Boolean Copy) - throw (SALOME::SALOME_Exception); + CORBA::Boolean Copy); void MirrorObject(SMESH::SMESH_IDSource_ptr theObject, const SMESH::AxisStruct & Axis, SMESH::SMESH_MeshEditor::MirrorType MirrorType, - CORBA::Boolean Copy) - throw (SALOME::SALOME_Exception); + CORBA::Boolean Copy); void Translate(const SMESH::long_array & IDsOfElements, const SMESH::DirStruct & Vector, - CORBA::Boolean Copy) - throw (SALOME::SALOME_Exception); + CORBA::Boolean Copy); void TranslateObject(SMESH::SMESH_IDSource_ptr theObject, const SMESH::DirStruct & Vector, - CORBA::Boolean Copy) - throw (SALOME::SALOME_Exception); + CORBA::Boolean Copy); void Rotate(const SMESH::long_array & IDsOfElements, const SMESH::AxisStruct & Axis, CORBA::Double Angle, - CORBA::Boolean Copy) - throw (SALOME::SALOME_Exception); + CORBA::Boolean Copy); void RotateObject(SMESH::SMESH_IDSource_ptr theObject, const SMESH::AxisStruct & Axis, CORBA::Double Angle, - CORBA::Boolean Copy) - throw (SALOME::SALOME_Exception); + CORBA::Boolean Copy); SMESH::ListOfGroups* MirrorMakeGroups(const SMESH::long_array& IDsOfElements, const SMESH::AxisStruct& Mirror, - SMESH::SMESH_MeshEditor::MirrorType MirrorType) - throw (SALOME::SALOME_Exception); + SMESH::SMESH_MeshEditor::MirrorType MirrorType); SMESH::ListOfGroups* MirrorObjectMakeGroups(SMESH::SMESH_IDSource_ptr Object, const SMESH::AxisStruct& Mirror, - SMESH::SMESH_MeshEditor::MirrorType MirrorType) - throw (SALOME::SALOME_Exception); + SMESH::SMESH_MeshEditor::MirrorType MirrorType); SMESH::ListOfGroups* TranslateMakeGroups(const SMESH::long_array& IDsOfElements, - const SMESH::DirStruct& Vector) - throw (SALOME::SALOME_Exception); + const SMESH::DirStruct& Vector); SMESH::ListOfGroups* TranslateObjectMakeGroups(SMESH::SMESH_IDSource_ptr Object, - const SMESH::DirStruct& Vector) - throw (SALOME::SALOME_Exception); + const SMESH::DirStruct& Vector); SMESH::ListOfGroups* RotateMakeGroups(const SMESH::long_array& IDsOfElements, const SMESH::AxisStruct& Axis, - CORBA::Double AngleInRadians) - throw (SALOME::SALOME_Exception); + CORBA::Double AngleInRadians); SMESH::ListOfGroups* RotateObjectMakeGroups(SMESH::SMESH_IDSource_ptr Object, const SMESH::AxisStruct& Axis, - CORBA::Double AngleInRadians) - throw (SALOME::SALOME_Exception); + CORBA::Double AngleInRadians); SMESH::SMESH_Mesh_ptr MirrorMakeMesh(const SMESH::long_array& IDsOfElements, const SMESH::AxisStruct& Mirror, SMESH::SMESH_MeshEditor::MirrorType MirrorType, CORBA::Boolean CopyGroups, - const char* MeshName) - throw (SALOME::SALOME_Exception); + const char* MeshName); SMESH::SMESH_Mesh_ptr MirrorObjectMakeMesh(SMESH::SMESH_IDSource_ptr Object, const SMESH::AxisStruct& Mirror, SMESH::SMESH_MeshEditor::MirrorType MirrorType, CORBA::Boolean CopyGroups, - const char* MeshName) - throw (SALOME::SALOME_Exception); + const char* MeshName); SMESH::SMESH_Mesh_ptr TranslateMakeMesh(const SMESH::long_array& IDsOfElements, const SMESH::DirStruct& Vector, CORBA::Boolean CopyGroups, - const char* MeshName) - throw (SALOME::SALOME_Exception); + const char* MeshName); SMESH::SMESH_Mesh_ptr TranslateObjectMakeMesh(SMESH::SMESH_IDSource_ptr Object, const SMESH::DirStruct& Vector, CORBA::Boolean CopyGroups, - const char* MeshName) - throw (SALOME::SALOME_Exception); + const char* MeshName); SMESH::SMESH_Mesh_ptr RotateMakeMesh(const SMESH::long_array& IDsOfElements, const SMESH::AxisStruct& Axis, CORBA::Double AngleInRadians, CORBA::Boolean CopyGroups, - const char* MeshName) - throw (SALOME::SALOME_Exception); + const char* MeshName); SMESH::SMESH_Mesh_ptr RotateObjectMakeMesh(SMESH::SMESH_IDSource_ptr Object, const SMESH::AxisStruct& Axis, CORBA::Double AngleInRadians, CORBA::Boolean CopyGroups, - const char* MeshName) - throw (SALOME::SALOME_Exception); + const char* MeshName); void Scale(SMESH::SMESH_IDSource_ptr theObject, const SMESH::PointStruct& thePoint, const SMESH::double_array& theScaleFact, - CORBA::Boolean theCopy) - throw (SALOME::SALOME_Exception); + CORBA::Boolean theCopy); SMESH::ListOfGroups* ScaleMakeGroups(SMESH::SMESH_IDSource_ptr theObject, const SMESH::PointStruct& thePoint, - const SMESH::double_array& theScaleFact) - throw (SALOME::SALOME_Exception); + const SMESH::double_array& theScaleFact); SMESH::SMESH_Mesh_ptr ScaleMakeMesh(SMESH::SMESH_IDSource_ptr Object, const SMESH::PointStruct& Point, const SMESH::double_array& theScaleFact, CORBA::Boolean CopyGroups, - const char* MeshName) - throw (SALOME::SALOME_Exception); + const char* MeshName); SMESH::SMESH_Mesh_ptr Offset( SMESH::SMESH_IDSource_ptr theObject, CORBA::Double Value, CORBA::Boolean CopyGroups, CORBA::Boolean CopyElements, const char* MeshName, - SMESH::ListOfGroups_out Groups) - throw (SALOME::SALOME_Exception); + SMESH::ListOfGroups_out Groups); void FindCoincidentNodes (CORBA::Double Tolerance, SMESH::array_of_long_array_out GroupsOfNodes, - CORBA::Boolean SeparateCornersAndMedium) - throw (SALOME::SALOME_Exception); + CORBA::Boolean SeparateCornersAndMedium); void FindCoincidentNodesOnPart(SMESH::SMESH_IDSource_ptr Object, CORBA::Double Tolerance, SMESH::array_of_long_array_out GroupsOfNodes, - CORBA::Boolean SeparateCornersAndMedium) - throw (SALOME::SALOME_Exception); + CORBA::Boolean SeparateCornersAndMedium); void FindCoincidentNodesOnPartBut(const SMESH::ListOfIDSources& Objects, CORBA::Double Tolerance, SMESH::array_of_long_array_out GroupsOfNodes, const SMESH::ListOfIDSources& ExceptSubMeshOrGroups, - CORBA::Boolean SeparateCornersAndMedium) - throw (SALOME::SALOME_Exception); + CORBA::Boolean SeparateCornersAndMedium); void MergeNodes (const SMESH::array_of_long_array& GroupsOfNodes, const SMESH::ListOfIDSources& NodesToKeep, - CORBA::Boolean AvoidMakingHoles ) - throw (SALOME::SALOME_Exception); + CORBA::Boolean AvoidMakingHoles ); void FindEqualElements(const SMESH::ListOfIDSources& Objects, const SMESH::ListOfIDSources& ExceptSubMeshOrGroups, - SMESH::array_of_long_array_out GroupsOfElementsID) - throw (SALOME::SALOME_Exception); + SMESH::array_of_long_array_out GroupsOfElementsID); void MergeElements(const SMESH::array_of_long_array& GroupsOfElementsID, - const SMESH::ListOfIDSources& ElementsToKeep) - throw (SALOME::SALOME_Exception); - void MergeEqualElements() - throw (SALOME::SALOME_Exception); + const SMESH::ListOfIDSources& ElementsToKeep); + void MergeEqualElements(); CORBA::Long MoveClosestNodeToPoint(CORBA::Double x, CORBA::Double y, CORBA::Double z, - CORBA::Long nodeID) - throw (SALOME::SALOME_Exception); + CORBA::Long nodeID); /*! * \brief Return ID of node closest to a given point */ CORBA::Long FindNodeClosestTo(CORBA::Double x, CORBA::Double y, - CORBA::Double z) - throw (SALOME::SALOME_Exception); + CORBA::Double z); /*! * Return elements of given type where the given point is IN or ON. * 'ALL' type means elements of any type excluding nodes @@ -543,8 +460,7 @@ public: SMESH::long_array* FindElementsByPoint(CORBA::Double x, CORBA::Double y, CORBA::Double z, - SMESH::ElementType type) - throw (SALOME::SALOME_Exception); + SMESH::ElementType type); /*! * Searching among the given elements, return elements of given type * where the given point is IN or ON. @@ -554,8 +470,7 @@ public: CORBA::Double x, CORBA::Double y, CORBA::Double z, - SMESH::ElementType type) - throw (SALOME::SALOME_Exception); + SMESH::ElementType type); /*! * Project a point to a mesh object. @@ -568,27 +483,23 @@ public: CORBA::Double z, SMESH::ElementType type, SMESH::SMESH_IDSource_ptr meshObject, - SMESH::double_array_out projecton) - throw (SALOME::SALOME_Exception); + SMESH::double_array_out projecton); /*! * Return point state in a closed 2D mesh in terms of TopAbs_State enumeration. * TopAbs_UNKNOWN state means that either mesh is wrong or the analysis fails. */ - CORBA::Short GetPointState(CORBA::Double x, CORBA::Double y, CORBA::Double z) - throw (SALOME::SALOME_Exception); + CORBA::Short GetPointState(CORBA::Double x, CORBA::Double y, CORBA::Double z); /*! * Check if a 2D mesh is manifold */ - CORBA::Boolean IsManifold() - throw (SALOME::SALOME_Exception); + CORBA::Boolean IsManifold(); /*! * Check if orientation of 2D elements is coherent */ - CORBA::Boolean IsCoherentOrientation2D() - throw (SALOME::SALOME_Exception); + CORBA::Boolean IsCoherentOrientation2D(); /*! * Partition given 1D elements into groups of contiguous edges. @@ -599,34 +510,29 @@ public: */ SMESH::array_of_long_array* Get1DBranches( SMESH::SMESH_IDSource_ptr edges, CORBA::Long startNode, - SMESH::array_of_long_array_out nodeGroups) - throw (SALOME::SALOME_Exception); + SMESH::array_of_long_array_out nodeGroups); /*! * Return sharp edges of faces and non-manifold ones. Optionally adds existing edges. */ - SMESH::ListOfEdges* FindSharpEdges(CORBA::Double angle, CORBA::Boolean addExisting) - throw (SALOME::SALOME_Exception); + SMESH::ListOfEdges* FindSharpEdges(CORBA::Double angle, CORBA::Boolean addExisting); /*! * Returns all or only closed FreeBorder's. */ - SMESH::ListOfFreeBorders* FindFreeBorders(CORBA::Boolean closedOnly) - throw (SALOME::SALOME_Exception); + SMESH::ListOfFreeBorders* FindFreeBorders(CORBA::Boolean closedOnly); /*! * Fill with 2D elements a hole defined by a FreeBorder. * Optionally add new faces to a given group, which is returned */ SMESH::SMESH_Group_ptr FillHole(const SMESH::FreeBorder& hole, - const char* groupName) - throw (SALOME::SALOME_Exception); + const char* groupName); SMESH::CoincidentFreeBorders* FindCoincidentFreeBorders(CORBA::Double tolerance); CORBA::Short SewCoincidentFreeBorders(const SMESH::CoincidentFreeBorders& freeBorders, CORBA::Boolean createPolygons, - CORBA::Boolean createPolyedrs) - throw (SALOME::SALOME_Exception); + CORBA::Boolean createPolyedrs); SMESH::SMESH_MeshEditor::Sew_Error SewFreeBorders(CORBA::Long FirstNodeID1, @@ -636,13 +542,13 @@ public: CORBA::Long SecondNodeID2, CORBA::Long LastNodeID2, CORBA::Boolean CreatePolygons, - CORBA::Boolean CreatePolyedrs) throw (SALOME::SALOME_Exception); + CORBA::Boolean CreatePolyedrs); SMESH::SMESH_MeshEditor::Sew_Error SewConformFreeBorders(CORBA::Long FirstNodeID1, CORBA::Long SecondNodeID1, CORBA::Long LastNodeID1, CORBA::Long FirstNodeID2, - CORBA::Long SecondNodeID2) throw (SALOME::SALOME_Exception); + CORBA::Long SecondNodeID2); SMESH::SMESH_MeshEditor::Sew_Error SewBorderToSide(CORBA::Long FirstNodeIDOnFreeBorder, CORBA::Long SecondNodeIDOnFreeBorder, @@ -650,38 +556,33 @@ public: CORBA::Long FirstNodeIDOnSide, CORBA::Long LastNodeIDOnSide, CORBA::Boolean CreatePolygons, - CORBA::Boolean CreatePolyedrs) throw (SALOME::SALOME_Exception); + CORBA::Boolean CreatePolyedrs); SMESH::SMESH_MeshEditor::Sew_Error SewSideElements(const SMESH::long_array& IDsOfSide1Elements, const SMESH::long_array& IDsOfSide2Elements, CORBA::Long NodeID1OfSide1ToMerge, CORBA::Long NodeID1OfSide2ToMerge, CORBA::Long NodeID2OfSide1ToMerge, - CORBA::Long NodeID2OfSide2ToMerge) throw (SALOME::SALOME_Exception); + CORBA::Long NodeID2OfSide2ToMerge); /*! * Set new nodes for given element. * If number of nodes is not corresponded to type of * element - returns false */ - CORBA::Boolean ChangeElemNodes(CORBA::Long ide, const SMESH::long_array& newIDs) - throw (SALOME::SALOME_Exception); + CORBA::Boolean ChangeElemNodes(CORBA::Long ide, const SMESH::long_array& newIDs); SMESH::SMESH_Group_ptr DoubleElements(SMESH::SMESH_IDSource_ptr theElements, - const char* theGroupName) - throw (SALOME::SALOME_Exception); + const char* theGroupName); CORBA::Boolean DoubleNodes( const SMESH::long_array& theNodes, - const SMESH::long_array& theModifiedElems ) - throw (SALOME::SALOME_Exception); + const SMESH::long_array& theModifiedElems ); CORBA::Boolean DoubleNode( CORBA::Long theNodeId, - const SMESH::long_array& theModifiedElems ) - throw (SALOME::SALOME_Exception); + const SMESH::long_array& theModifiedElems ); CORBA::Boolean DoubleNodeGroup( SMESH::SMESH_GroupBase_ptr theNodes, - SMESH::SMESH_GroupBase_ptr theModifiedElems ) - throw (SALOME::SALOME_Exception); + SMESH::SMESH_GroupBase_ptr theModifiedElems ); /*! * \brief Creates a hole in a mesh by doubling the nodes of some particular elements. @@ -692,16 +593,13 @@ public: * \sa DoubleNodeGroup() */ SMESH::SMESH_Group_ptr DoubleNodeGroupNew( SMESH::SMESH_GroupBase_ptr theNodes, - SMESH::SMESH_GroupBase_ptr theModifiedElems ) - throw (SALOME::SALOME_Exception); + SMESH::SMESH_GroupBase_ptr theModifiedElems ); CORBA::Boolean DoubleNodeGroups( const SMESH::ListOfGroups& theNodes, - const SMESH::ListOfGroups& theModifiedElems ) - throw (SALOME::SALOME_Exception); + const SMESH::ListOfGroups& theModifiedElems ); SMESH::SMESH_Group_ptr DoubleNodeGroupsNew( const SMESH::ListOfGroups& theNodes, - const SMESH::ListOfGroups& theModifiedElems ) - throw (SALOME::SALOME_Exception); + const SMESH::ListOfGroups& theModifiedElems ); /*! * \brief Creates a hole in a mesh by doubling the nodes of some particular elements @@ -715,8 +613,7 @@ public: */ CORBA::Boolean DoubleNodeElem( const SMESH::long_array& theElems, const SMESH::long_array& theNodesNot, - const SMESH::long_array& theAffectedElems ) - throw (SALOME::SALOME_Exception); + const SMESH::long_array& theAffectedElems ); /*! * \brief Creates a hole in a mesh by doubling the nodes of some particular elements @@ -731,8 +628,7 @@ public: */ CORBA::Boolean DoubleNodeElemInRegion( const SMESH::long_array& theElems, const SMESH::long_array& theNodesNot, - GEOM::GEOM_Object_ptr theShape ) - throw (SALOME::SALOME_Exception); + GEOM::GEOM_Object_ptr theShape ); /*! * \brief Creates a hole in a mesh by doubling the nodes of some particular elements @@ -745,8 +641,7 @@ public: */ CORBA::Boolean DoubleNodeElemGroup( SMESH::SMESH_GroupBase_ptr theElems, SMESH::SMESH_GroupBase_ptr theNodesNot, - SMESH::SMESH_GroupBase_ptr theAffectedElems ) - throw (SALOME::SALOME_Exception); + SMESH::SMESH_GroupBase_ptr theAffectedElems ); /*! * \brief Creates a hole in a mesh by doubling the nodes of some particular elements @@ -760,15 +655,13 @@ public: */ SMESH::SMESH_Group_ptr DoubleNodeElemGroupNew( SMESH::SMESH_GroupBase_ptr theElems, SMESH::SMESH_GroupBase_ptr theNodesNot, - SMESH::SMESH_GroupBase_ptr theAffectedElems ) - throw (SALOME::SALOME_Exception); + SMESH::SMESH_GroupBase_ptr theAffectedElems ); SMESH::ListOfGroups* DoubleNodeElemGroup2New(SMESH::SMESH_GroupBase_ptr theElems, SMESH::SMESH_GroupBase_ptr theNodesNot, SMESH::SMESH_GroupBase_ptr theAffectedElems, CORBA::Boolean theElemGroupNeeded, - CORBA::Boolean theNodeGroupNeeded) - throw (SALOME::SALOME_Exception); + CORBA::Boolean theNodeGroupNeeded); /*! * \brief Creates a hole in a mesh by doubling the nodes of some particular elements @@ -782,8 +675,7 @@ public: */ CORBA::Boolean DoubleNodeElemGroupInRegion( SMESH::SMESH_GroupBase_ptr theElems, SMESH::SMESH_GroupBase_ptr theNodesNot, - GEOM::GEOM_Object_ptr theShape ) - throw (SALOME::SALOME_Exception); + GEOM::GEOM_Object_ptr theShape ); /*! * \brief Creates a hole in a mesh by doubling the nodes of some particular elements @@ -797,8 +689,7 @@ public: */ CORBA::Boolean DoubleNodeElemGroups( const SMESH::ListOfGroups& theElems, const SMESH::ListOfGroups& theNodesNot, - const SMESH::ListOfGroups& theAffectedElems ) - throw (SALOME::SALOME_Exception); + const SMESH::ListOfGroups& theAffectedElems ); /*! * \brief Creates a hole in a mesh by doubling the nodes of some particular elements @@ -812,15 +703,13 @@ public: */ SMESH::SMESH_Group_ptr DoubleNodeElemGroupsNew( const SMESH::ListOfGroups& theElems, const SMESH::ListOfGroups& theNodesNot, - const SMESH::ListOfGroups& theAffectedElems ) - throw (SALOME::SALOME_Exception); + const SMESH::ListOfGroups& theAffectedElems ); SMESH::ListOfGroups* DoubleNodeElemGroups2New(const SMESH::ListOfGroups& theElems, const SMESH::ListOfGroups& theNodesNot, const SMESH::ListOfGroups& theAffectedElems, CORBA::Boolean theElemGroupNeeded, - CORBA::Boolean theNodeGroupNeeded) - throw (SALOME::SALOME_Exception); + CORBA::Boolean theNodeGroupNeeded); /*! * \brief Creates a hole in a mesh by doubling the nodes of some particular elements @@ -835,8 +724,7 @@ public: */ CORBA::Boolean DoubleNodeElemGroupsInRegion( const SMESH::ListOfGroups& theElems, const SMESH::ListOfGroups& theNodesNot, - GEOM::GEOM_Object_ptr theShape ) - throw (SALOME::SALOME_Exception); + GEOM::GEOM_Object_ptr theShape ); /*! * \brief Identify the elements that will be affected by node duplication (actual duplication is not performed. @@ -851,8 +739,7 @@ public: */ SMESH::ListOfGroups* AffectedElemGroupsInRegion( const SMESH::ListOfGroups& theElems, const SMESH::ListOfGroups& theNodesNot, - GEOM::GEOM_Object_ptr theShape ) - throw (SALOME::SALOME_Exception); + GEOM::GEOM_Object_ptr theShape ); /*! * \brief Double nodes on shared faces between groups of volumes and create flat elements on demand. @@ -868,8 +755,7 @@ public: */ CORBA::Boolean DoubleNodesOnGroupBoundaries( const SMESH::ListOfGroups& theDomains, CORBA::Boolean createJointElems, - CORBA::Boolean onAllBoundaries ) - throw (SALOME::SALOME_Exception); + CORBA::Boolean onAllBoundaries ); /*! * \brief Double nodes on some external faces and create flat elements. * Flat elements are mainly used by some types of mechanic calculations. @@ -879,8 +765,7 @@ public: * @param theGroupsOfFaces - list of groups of faces * @return TRUE if operation has been completed successfully, FALSE otherwise */ - CORBA::Boolean CreateFlatElementsOnFacesGroups( const SMESH::ListOfGroups& theGroupsOfFaces ) - throw (SALOME::SALOME_Exception); + CORBA::Boolean CreateFlatElementsOnFacesGroups( const SMESH::ListOfGroups& theGroupsOfFaces ); /*! * \brief identify all the elements around a geom shape, get the faces delimiting the hole @@ -892,16 +777,14 @@ public: GEOM::GEOM_Object_ptr theShape, const char* groupName, const SMESH::double_array& theNodesCoords, - SMESH::array_of_long_array_out GroupsOfNodes) - throw (SALOME::SALOME_Exception); + SMESH::array_of_long_array_out GroupsOfNodes); /*! * \brief Generated skin mesh (containing 2D cells) from 3D mesh * The created 2D mesh elements based on nodes of free faces of boundary volumes * \return TRUE if operation has been completed successfully, FALSE otherwise */ - CORBA::Boolean Make2DMeshFrom3D() - throw (SALOME::SALOME_Exception); + CORBA::Boolean Make2DMeshFrom3D(); SMESH::SMESH_Mesh_ptr MakeBoundaryMesh(SMESH::SMESH_IDSource_ptr elements, SMESH::Bnd_Dimension dimension, @@ -909,8 +792,7 @@ public: const char* meshName, CORBA::Boolean toCopyElements, CORBA::Boolean toCopyMissingBondary, - SMESH::SMESH_Group_out group) - throw (SALOME::SALOME_Exception); + SMESH::SMESH_Group_out group); CORBA::Long MakeBoundaryElements(SMESH::Bnd_Dimension dimension, const char* groupName, @@ -918,8 +800,7 @@ public: CORBA::Boolean toCopyAll, const SMESH::ListOfIDSources& groups, SMESH::SMESH_Mesh_out mesh, - SMESH::SMESH_Group_out group) - throw (SALOME::SALOME_Exception); + SMESH::SMESH_Group_out group); /*! * \brief Create a polyline consisting of 1D mesh elements each lying on a 2D element of @@ -938,8 +819,7 @@ public: * be added. */ void MakePolyLine(SMESH::ListOfPolySegments& segments, - const char* groupName) - throw (SALOME::SALOME_Exception); + const char* groupName); /*! * \brief Create a slot of given width around given 1D elements lying on a triangle mesh. @@ -948,8 +828,7 @@ public: * \return Edges located at the slot boundary */ SMESH::ListOfEdges* MakeSlot(SMESH::SMESH_GroupBase_ptr segments, - CORBA::Double width) - throw (SALOME::SALOME_Exception); + CORBA::Double width); private: //!< private methods @@ -970,42 +849,36 @@ public: /*! * \brief Return groups by their IDs */ - SMESH::ListOfGroups* getGroups(const std::list* groupIDs) - throw (SALOME::SALOME_Exception); + SMESH::ListOfGroups* getGroups(const std::list* groupIDs); SMESH::ListOfGroups* mirror(TIDSortedElemSet & IDsOfElements, const SMESH::AxisStruct & Axis, SMESH::SMESH_MeshEditor::MirrorType MirrorType, CORBA::Boolean Copy, bool MakeGroups, - ::SMESH_Mesh* TargetMesh=0) - throw (SALOME::SALOME_Exception); + ::SMESH_Mesh* TargetMesh=0); SMESH::ListOfGroups* translate(TIDSortedElemSet & IDsOfElements, const SMESH::DirStruct & Vector, CORBA::Boolean Copy, bool MakeGroups, - ::SMESH_Mesh* TargetMesh=0) - throw (SALOME::SALOME_Exception); + ::SMESH_Mesh* TargetMesh=0); SMESH::ListOfGroups* rotate(TIDSortedElemSet & IDsOfElements, const SMESH::AxisStruct & Axis, CORBA::Double Angle, CORBA::Boolean Copy, bool MakeGroups, - ::SMESH_Mesh* TargetMesh=0) - throw (SALOME::SALOME_Exception); + ::SMESH_Mesh* TargetMesh=0); SMESH::ListOfGroups* scale(SMESH::SMESH_IDSource_ptr theObject, const SMESH::PointStruct& thePoint, const SMESH::double_array& theScaleFact, CORBA::Boolean theCopy, bool theMakeGroups, - ::SMESH_Mesh* theTargetMesh=0) - throw (SALOME::SALOME_Exception); + ::SMESH_Mesh* theTargetMesh=0); void convertToQuadratic(CORBA::Boolean theForce3d, CORBA::Boolean theToBiQuad, - SMESH::SMESH_IDSource_ptr theObject = SMESH::SMESH_IDSource::_nil()) - throw (SALOME::SALOME_Exception); + SMESH::SMESH_IDSource_ptr theObject = SMESH::SMESH_IDSource::_nil()); SMESH::SMESH_Mesh_ptr makeMesh(const char* theMeshName); diff --git a/src/SMESH_I/SMESH_Mesh_i.cxx b/src/SMESH_I/SMESH_Mesh_i.cxx index 8455f6b46..4cb097bab 100644 --- a/src/SMESH_I/SMESH_Mesh_i.cxx +++ b/src/SMESH_I/SMESH_Mesh_i.cxx @@ -183,7 +183,6 @@ SMESH_Mesh_i::~SMESH_Mesh_i() //============================================================================= void SMESH_Mesh_i::SetShape( GEOM::GEOM_Object_ptr theShapeObject ) - throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); try { @@ -206,7 +205,6 @@ void SMESH_Mesh_i::SetShape( GEOM::GEOM_Object_ptr theShapeObject ) //================================================================================ CORBA::Boolean SMESH_Mesh_i::HasShapeToMesh() - throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); bool res = false; @@ -226,7 +224,6 @@ CORBA::Boolean SMESH_Mesh_i::HasShapeToMesh() //================================================================================ GEOM::GEOM_Object_ptr SMESH_Mesh_i::GetShapeToMesh() - throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); GEOM::GEOM_Object_var aShapeObj; @@ -263,7 +260,7 @@ GEOM::GEOM_Object_ptr SMESH_Mesh_i::GetShapeToMesh() */ //================================================================================ -CORBA::Boolean SMESH_Mesh_i::IsLoaded() throw (SALOME::SALOME_Exception) +CORBA::Boolean SMESH_Mesh_i::IsLoaded() { Unexpect aCatch(SALOME_SalomeException); return !_preMeshInfo; @@ -275,7 +272,7 @@ CORBA::Boolean SMESH_Mesh_i::IsLoaded() throw (SALOME::SALOME_Exception) */ //================================================================================ -void SMESH_Mesh_i::Load() throw (SALOME::SALOME_Exception) +void SMESH_Mesh_i::Load() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -288,7 +285,7 @@ void SMESH_Mesh_i::Load() throw (SALOME::SALOME_Exception) */ //================================================================================ -void SMESH_Mesh_i::Clear() throw (SALOME::SALOME_Exception) +void SMESH_Mesh_i::Clear() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -315,7 +312,6 @@ void SMESH_Mesh_i::Clear() throw (SALOME::SALOME_Exception) //================================================================================ void SMESH_Mesh_i::ClearSubMesh(CORBA::Long ShapeID) - throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -394,7 +390,6 @@ static SMESH::ComputeError* ConvertComputeError( SMESH_ComputeErrorPtr errorPtr SMESH::DriverMED_ReadStatus SMESH_Mesh_i::ImportMEDFile( const char* theFileName, const char* theMeshName ) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); int status; @@ -433,7 +428,6 @@ SMESH_Mesh_i::ImportMEDFile( const char* theFileName, const char* theMeshName ) SMESH::DriverMED_ReadStatus SMESH_Mesh_i::ImportCGNSFile( const char* theFileName, const int theMeshIndex, std::string& theMeshName ) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); int status; @@ -499,7 +493,6 @@ SMESH::long_array* SMESH_Mesh_i::GetMEDVersionsCompatibleForAppend() //============================================================================= int SMESH_Mesh_i::ImportUNVFile( const char* theFileName ) - throw ( SALOME::SALOME_Exception ) { SMESH_TRY; @@ -529,7 +522,6 @@ int SMESH_Mesh_i::ImportUNVFile( const char* theFileName ) //============================================================================= int SMESH_Mesh_i::ImportSTLFile( const char* theFileName ) - throw ( SALOME::SALOME_Exception ) { SMESH_TRY; @@ -574,7 +566,6 @@ namespace SMESH::ComputeError* SMESH_Mesh_i::ImportGMFFile( const char* theFileName, bool theMakeRequiredGroups ) - throw (SALOME::SALOME_Exception) { SMESH_ComputeErrorPtr error; @@ -646,7 +637,6 @@ SMESH::Hypothesis_Status SMESH_Mesh_i::AddHypothesis(GEOM::GEOM_Object_ptr aSubShape, SMESH::SMESH_Hypothesis_ptr anHyp, CORBA::String_out anErrorText) - throw(SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); @@ -740,7 +730,6 @@ SMESH_Mesh_i::addHypothesis(GEOM::GEOM_Object_ptr aSubShape, SMESH::Hypothesis_Status SMESH_Mesh_i::RemoveHypothesis(GEOM::GEOM_Object_ptr aSubShape, SMESH::SMESH_Hypothesis_ptr anHyp) - throw(SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -819,7 +808,6 @@ SMESH_Mesh_i::removeHypothesis(GEOM::GEOM_Object_ptr aSubShape, SMESH::ListOfHypothesis * SMESH_Mesh_i::GetHypothesisList(GEOM::GEOM_Object_ptr aSubShape) -throw(SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if (MYDEBUG) MESSAGE("GetHypothesisList"); @@ -859,7 +847,7 @@ throw(SALOME::SALOME_Exception) */ //================================================================================ -SMESH::submesh_array* SMESH_Mesh_i::GetSubMeshes() throw (SALOME::SALOME_Exception) +SMESH::submesh_array* SMESH_Mesh_i::GetSubMeshes() { Unexpect aCatch(SALOME_SalomeException); if (MYDEBUG) MESSAGE("GetSubMeshes"); @@ -903,7 +891,6 @@ SMESH::submesh_array* SMESH_Mesh_i::GetSubMeshes() throw (SALOME::SALOME_Excepti SMESH::SMESH_subMesh_ptr SMESH_Mesh_i::GetSubMesh(GEOM::GEOM_Object_ptr aSubShape, const char* theName ) - throw(SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if (CORBA::is_nil(aSubShape)) @@ -955,7 +942,6 @@ SMESH::SMESH_subMesh_ptr SMESH_Mesh_i::GetSubMesh(GEOM::GEOM_Object_ptr aSubShap //================================================================================ void SMESH_Mesh_i::RemoveSubMesh( SMESH::SMESH_subMesh_ptr theSubMesh ) - throw (SALOME::SALOME_Exception) { SMESH_TRY; @@ -999,7 +985,6 @@ void SMESH_Mesh_i::RemoveSubMesh( SMESH::SMESH_subMesh_ptr theSubMesh ) SMESH::SMESH_Group_ptr SMESH_Mesh_i::CreateGroup( SMESH::ElementType theElemType, const char* theName ) - throw(SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -1031,7 +1016,6 @@ SMESH::SMESH_GroupOnGeom_ptr SMESH_Mesh_i::CreateGroupFromGEOM (SMESH::ElementType theElemType, const char* theName, GEOM::GEOM_Object_ptr theGeomObj) - throw(SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -1073,7 +1057,6 @@ SMESH::SMESH_GroupOnFilter_ptr SMESH_Mesh_i::CreateGroupFromFilter(SMESH::ElementType theElemType, const char* theName, SMESH::Filter_ptr theFilter ) - throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -1113,7 +1096,6 @@ SMESH_Mesh_i::CreateGroupFromFilter(SMESH::ElementType theElemType, //================================================================================ void SMESH_Mesh_i::RemoveGroup( SMESH::SMESH_GroupBase_ptr theGroup ) - throw (SALOME::SALOME_Exception) { if ( theGroup->_is_nil() ) return; @@ -1153,7 +1135,6 @@ void SMESH_Mesh_i::RemoveGroup( SMESH::SMESH_GroupBase_ptr theGroup ) //============================================================================= void SMESH_Mesh_i::RemoveGroupWithContents( SMESH::SMESH_GroupBase_ptr theGroup ) - throw (SALOME::SALOME_Exception) { SMESH_TRY; if ( _preMeshInfo ) @@ -1230,7 +1211,7 @@ void SMESH_Mesh_i::RemoveGroupWithContents( SMESH::SMESH_GroupBase_ptr theGroup */ //================================================================================ -SMESH::ListOfGroups * SMESH_Mesh_i::GetGroups() throw(SALOME::SALOME_Exception) +SMESH::ListOfGroups * SMESH_Mesh_i::GetGroups() { Unexpect aCatch(SALOME_SalomeException); if (MYDEBUG) MESSAGE("GetGroups"); @@ -1269,7 +1250,7 @@ SMESH::ListOfGroups * SMESH_Mesh_i::GetGroups() throw(SALOME::SALOME_Exception) */ //============================================================================= -CORBA::Long SMESH_Mesh_i::NbGroups() throw (SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbGroups() { Unexpect aCatch(SALOME_SalomeException); return _mapGroups.size(); @@ -1284,7 +1265,6 @@ CORBA::Long SMESH_Mesh_i::NbGroups() throw (SALOME::SALOME_Exception) SMESH::SMESH_Group_ptr SMESH_Mesh_i::UnionGroups( SMESH::SMESH_GroupBase_ptr theGroup1, SMESH::SMESH_GroupBase_ptr theGroup2, const char* theName ) - throw (SALOME::SALOME_Exception) { SMESH::SMESH_Group_var aResGrp; @@ -1328,7 +1308,6 @@ SMESH::SMESH_Group_ptr SMESH_Mesh_i::UnionGroups( SMESH::SMESH_GroupBase_ptr the SMESH::SMESH_Group_ptr SMESH_Mesh_i::UnionListOfGroups(const SMESH::ListOfGroups& theGroups, const char* theName ) - throw (SALOME::SALOME_Exception) { SMESH::SMESH_Group_var aResGrp; @@ -1391,7 +1370,6 @@ SMESH::SMESH_Group_ptr SMESH_Mesh_i::UnionListOfGroups(const SMESH::ListOfGroups SMESH::SMESH_Group_ptr SMESH_Mesh_i::IntersectGroups( SMESH::SMESH_GroupBase_ptr theGroup1, SMESH::SMESH_GroupBase_ptr theGroup2, const char* theName ) - throw (SALOME::SALOME_Exception) { SMESH::SMESH_Group_var aResGrp; @@ -1457,7 +1435,6 @@ SMESH::SMESH_Group_ptr SMESH_Mesh_i::IntersectGroups( SMESH::SMESH_GroupBase_ptr SMESH::SMESH_Group_ptr SMESH_Mesh_i::IntersectListOfGroups(const SMESH::ListOfGroups& theGroups, const char* theName ) - throw (SALOME::SALOME_Exception) { SMESH::SMESH_Group_var aResGrp; @@ -1541,7 +1518,6 @@ SMESH_Mesh_i::IntersectListOfGroups(const SMESH::ListOfGroups& theGroups, SMESH::SMESH_Group_ptr SMESH_Mesh_i::CutGroups( SMESH::SMESH_GroupBase_ptr theGroup1, SMESH::SMESH_GroupBase_ptr theGroup2, const char* theName ) - throw (SALOME::SALOME_Exception) { SMESH::SMESH_Group_var aResGrp; @@ -1608,7 +1584,6 @@ SMESH::SMESH_Group_ptr SMESH_Mesh_i::CutListOfGroups(const SMESH::ListOfGroups& theMainGroups, const SMESH::ListOfGroups& theToolGroups, const char* theName ) - throw (SALOME::SALOME_Exception) { SMESH::SMESH_Group_var aResGrp; @@ -1697,25 +1672,25 @@ SMESH_Mesh_i::CutListOfGroups(const SMESH::ListOfGroups& theMainGroups, namespace // functions making checks according to SMESH::NB_COMMON_NODES_ENUM { - bool isAllNodesCommon(int nbChecked, int nbCommon, int nbNodes, int nbCorners, + bool isAllNodesCommon(int nbChecked, int nbCommon, int nbNodes, int /*nbCorners*/, bool & toStopChecking ) { toStopChecking = ( nbCommon < nbChecked ); return nbCommon == nbNodes; } - bool isMainNodesCommon(int nbChecked, int nbCommon, int nbNodes, int nbCorners, + bool isMainNodesCommon(int nbChecked, int nbCommon, int /*nbNodes*/, int nbCorners, bool & toStopChecking ) { toStopChecking = ( nbCommon < nbChecked || nbChecked >= nbCorners ); return nbCommon == nbCorners; } - bool isAtLeastOneNodeCommon(int nbChecked, int nbCommon, int nbNodes, int nbCorners, - bool & toStopChecking ) + bool isAtLeastOneNodeCommon(int /*nbChecked*/, int nbCommon, int /*nbNodes*/, int /*nbCorners*/, + bool & /*toStopChecking*/ ) { return nbCommon > 0; } - bool isMajorityOfNodesCommon(int nbChecked, int nbCommon, int nbNodes, int nbCorners, - bool & toStopChecking ) + bool isMajorityOfNodesCommon(int /*nbChecked*/, int nbCommon, int nbNodes, int /*nbCorners*/, + bool & /*toStopChecking*/ ) { return nbCommon >= (nbNodes+1) / 2; } @@ -1741,7 +1716,6 @@ SMESH_Mesh_i::CreateDimGroup(const SMESH::ListOfIDSources& theGroups, const char* theName, SMESH::NB_COMMON_NODES_ENUM theNbCommonNodes, CORBA::Boolean theUnderlyingOnly) - throw (SALOME::SALOME_Exception) { SMESH::SMESH_Group_var aResGrp; @@ -1922,7 +1896,6 @@ SMESH::ListOfGroups* SMESH_Mesh_i::FaceGroupsSeparatedByEdges( CORBA::Double theSharpAngle, CORBA::Boolean theCreateEdges, CORBA::Boolean theUseExistingEdges ) - throw (SALOME::SALOME_Exception) { if ( theSharpAngle < 0 || theSharpAngle > 180 ) THROW_SALOME_CORBA_EXCEPTION("Invalid sharp angle, it must be between 0 and 180 degrees", @@ -2050,7 +2023,6 @@ void SMESH_Mesh_i::removeGeomGroupData(CORBA::Object_ptr theSmeshObj) //================================================================================ void SMESH_Mesh_i::ReplaceShape(GEOM::GEOM_Object_ptr theNewGeom) - throw (SALOME::SALOME_Exception) { // check if geometry changed bool geomChanged = true; @@ -3053,7 +3025,6 @@ void SMESH_Mesh_i::CheckGeomGroupModif() //============================================================================= SMESH::SMESH_Group_ptr SMESH_Mesh_i::ConvertToStandalone( SMESH::SMESH_GroupBase_ptr theGroup ) - throw (SALOME::SALOME_Exception) { SMESH::SMESH_Group_var aGroup; @@ -3176,7 +3147,7 @@ SMESH::SMESH_subMesh_ptr SMESH_Mesh_i::createSubMesh( GEOM::GEOM_Object_ptr theS // register CORBA object for persistence int nextId = _gen_i->RegisterObject( subMesh ); if(MYDEBUG) { MESSAGE( "Add submesh to map with id = "<< nextId); } - else { nextId = 0; } // avoid "unused variable" warning + else { (void)nextId; } // avoid "unused variable" warning // to track changes of GEOM groups if ( subMeshId > 0 ) @@ -3355,7 +3326,6 @@ void SMESH_Mesh_i::removeGroup( const int theId ) //================================================================================ SMESH::log_array * SMESH_Mesh_i::GetLog(CORBA::Boolean clearAfterGet) - throw(SALOME::SALOME_Exception) { SMESH::log_array_var aLog; @@ -3408,7 +3378,7 @@ SMESH::log_array * SMESH_Mesh_i::GetLog(CORBA::Boolean clearAfterGet) */ //================================================================================ -void SMESH_Mesh_i::ClearLog() throw(SALOME::SALOME_Exception) +void SMESH_Mesh_i::ClearLog() { SMESH_TRY; _impl->ClearLog(); @@ -3421,7 +3391,7 @@ void SMESH_Mesh_i::ClearLog() throw(SALOME::SALOME_Exception) */ //================================================================================ -CORBA::Long SMESH_Mesh_i::GetId()throw(SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::GetId() { return _id; } @@ -3527,7 +3497,6 @@ void SMESH_Mesh_i::SetImpl(::SMESH_Mesh * impl) //============================================================================= SMESH::SMESH_MeshEditor_ptr SMESH_Mesh_i::GetMeshEditor() - throw (SALOME::SALOME_Exception) { SMESH::SMESH_MeshEditor_var aMeshEdVar; @@ -3556,7 +3525,6 @@ SMESH::SMESH_MeshEditor_ptr SMESH_Mesh_i::GetMeshEditor() //============================================================================= SMESH::SMESH_MeshEditor_ptr SMESH_Mesh_i::GetMeshEditPreviewer() - throw (SALOME::SALOME_Exception) { SMESH::SMESH_MeshEditor_var aMeshEdVar; @@ -3580,7 +3548,7 @@ SMESH::SMESH_MeshEditor_ptr SMESH_Mesh_i::GetMeshEditPreviewer() */ //================================================================================ -CORBA::Boolean SMESH_Mesh_i::HasModificationsToDiscard() throw(SALOME::SALOME_Exception) +CORBA::Boolean SMESH_Mesh_i::HasModificationsToDiscard() { Unexpect aCatch(SALOME_SalomeException); return _impl->HasModificationsToDiscard(); @@ -3628,7 +3596,7 @@ static SALOMEDS::Color getUniqueColor( const std::list& theRese */ //============================================================================= -void SMESH_Mesh_i::SetAutoColor(CORBA::Boolean theAutoColor) throw(SALOME::SALOME_Exception) +void SMESH_Mesh_i::SetAutoColor(CORBA::Boolean theAutoColor) { Unexpect aCatch(SALOME_SalomeException); _impl->SetAutoColor(theAutoColor); @@ -3652,7 +3620,7 @@ void SMESH_Mesh_i::SetAutoColor(CORBA::Boolean theAutoColor) throw(SALOME::SALOM */ //============================================================================= -CORBA::Boolean SMESH_Mesh_i::GetAutoColor() throw(SALOME::SALOME_Exception) +CORBA::Boolean SMESH_Mesh_i::GetAutoColor() { Unexpect aCatch(SALOME_SalomeException); return _impl->GetAutoColor(); @@ -3769,7 +3737,6 @@ void SMESH_Mesh_i::ExportMED(const char* file, CORBA::Long version, CORBA::Boolean overwrite, CORBA::Boolean autoDimension) - throw(SALOME::SALOME_Exception) { //MESSAGE("MED minor version: "<< minor); SMESH_TRY; @@ -3798,7 +3765,6 @@ void SMESH_Mesh_i::ExportMED(const char* file, void SMESH_Mesh_i::ExportSAUV (const char* file, CORBA::Boolean auto_groups) - throw(SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -3818,7 +3784,6 @@ void SMESH_Mesh_i::ExportSAUV (const char* file, //================================================================================ void SMESH_Mesh_i::ExportDAT (const char *file) - throw(SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -3841,7 +3806,6 @@ void SMESH_Mesh_i::ExportDAT (const char *file) //================================================================================ void SMESH_Mesh_i::ExportUNV (const char *file) - throw(SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -3864,7 +3828,6 @@ void SMESH_Mesh_i::ExportUNV (const char *file) //================================================================================ void SMESH_Mesh_i::ExportSTL (const char *file, const bool isascii) - throw(SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -3901,7 +3864,6 @@ void SMESH_Mesh_i::ExportPartToMED(SMESH::SMESH_IDSource_ptr meshPart, const GEOM::ListOfFields& fields, const char* geomAssocFields, CORBA::Double ZTolerance) - throw (SALOME::SALOME_Exception) { MESSAGE("MED version: "<< version); SMESH_TRY; @@ -4286,7 +4248,6 @@ void SMESH_Mesh_i::exportMEDFields( DriverMED_W_Field& fieldWriter, void SMESH_Mesh_i::ExportPartToDAT(::SMESH::SMESH_IDSource_ptr meshPart, const char* file) - throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4308,7 +4269,6 @@ void SMESH_Mesh_i::ExportPartToDAT(::SMESH::SMESH_IDSource_ptr meshPart, void SMESH_Mesh_i::ExportPartToUNV(::SMESH::SMESH_IDSource_ptr meshPart, const char* file) - throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4331,7 +4291,6 @@ void SMESH_Mesh_i::ExportPartToUNV(::SMESH::SMESH_IDSource_ptr meshPart, void SMESH_Mesh_i::ExportPartToSTL(::SMESH::SMESH_IDSource_ptr meshPart, const char* file, ::CORBA::Boolean isascii) - throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4361,7 +4320,6 @@ void SMESH_Mesh_i::ExportCGNS(::SMESH::SMESH_IDSource_ptr meshPart, const char* file, CORBA::Boolean overwrite, CORBA::Boolean groupElemsByType) - throw (SALOME::SALOME_Exception) { #ifdef WITH_CGNS Unexpect aCatch(SALOME_SalomeException); @@ -4400,7 +4358,6 @@ void SMESH_Mesh_i::ExportCGNS(::SMESH::SMESH_IDSource_ptr meshPart, void SMESH_Mesh_i::ExportGMF(::SMESH::SMESH_IDSource_ptr meshPart, const char* file, bool withRequiredGroups) - throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4439,7 +4396,7 @@ CORBA::Double SMESH_Mesh_i::GetComputeProgress() */ //================================================================================ -CORBA::Long SMESH_Mesh_i::NbNodes()throw(SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbNodes() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4454,7 +4411,7 @@ CORBA::Long SMESH_Mesh_i::NbNodes()throw(SALOME::SALOME_Exception) */ //================================================================================ -CORBA::Long SMESH_Mesh_i::NbElements()throw (SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbElements() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4469,7 +4426,7 @@ CORBA::Long SMESH_Mesh_i::NbElements()throw (SALOME::SALOME_Exception) */ //================================================================================ -CORBA::Long SMESH_Mesh_i::Nb0DElements()throw (SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::Nb0DElements() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4484,7 +4441,7 @@ CORBA::Long SMESH_Mesh_i::Nb0DElements()throw (SALOME::SALOME_Exception) */ //================================================================================ -CORBA::Long SMESH_Mesh_i::NbBalls() throw (SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbBalls() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4499,7 +4456,7 @@ CORBA::Long SMESH_Mesh_i::NbBalls() throw (SALOME::SALOME_Exception) */ //================================================================================ -CORBA::Long SMESH_Mesh_i::NbEdges()throw(SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbEdges() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4515,7 +4472,6 @@ CORBA::Long SMESH_Mesh_i::NbEdges()throw(SALOME::SALOME_Exception) //================================================================================ CORBA::Long SMESH_Mesh_i::NbEdgesOfOrder(SMESH::ElementOrder order) - throw(SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4530,7 +4486,7 @@ CORBA::Long SMESH_Mesh_i::NbEdgesOfOrder(SMESH::ElementOrder order) */ //================================================================================ -CORBA::Long SMESH_Mesh_i::NbFaces()throw(SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbFaces() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4545,7 +4501,7 @@ CORBA::Long SMESH_Mesh_i::NbFaces()throw(SALOME::SALOME_Exception) */ //================================================================================ -CORBA::Long SMESH_Mesh_i::NbTriangles()throw(SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbTriangles() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4560,7 +4516,7 @@ CORBA::Long SMESH_Mesh_i::NbTriangles()throw(SALOME::SALOME_Exception) */ //================================================================================ -CORBA::Long SMESH_Mesh_i::NbBiQuadTriangles()throw(SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbBiQuadTriangles() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4569,7 +4525,7 @@ CORBA::Long SMESH_Mesh_i::NbBiQuadTriangles()throw(SALOME::SALOME_Exception) return _impl->NbBiQuadTriangles(); } -CORBA::Long SMESH_Mesh_i::NbQuadrangles()throw(SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbQuadrangles() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4578,7 +4534,7 @@ CORBA::Long SMESH_Mesh_i::NbQuadrangles()throw(SALOME::SALOME_Exception) return _impl->NbQuadrangles(); } -CORBA::Long SMESH_Mesh_i::NbBiQuadQuadrangles()throw(SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbBiQuadQuadrangles() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4587,7 +4543,7 @@ CORBA::Long SMESH_Mesh_i::NbBiQuadQuadrangles()throw(SALOME::SALOME_Exception) return _impl->NbBiQuadQuadrangles(); } -CORBA::Long SMESH_Mesh_i::NbPolygons() throw(SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbPolygons() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4596,7 +4552,7 @@ CORBA::Long SMESH_Mesh_i::NbPolygons() throw(SALOME::SALOME_Exception) return _impl->NbPolygons(); } -CORBA::Long SMESH_Mesh_i::NbPolygonsOfOrder(SMESH::ElementOrder order) throw(SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbPolygonsOfOrder(SMESH::ElementOrder order) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4606,7 +4562,6 @@ CORBA::Long SMESH_Mesh_i::NbPolygonsOfOrder(SMESH::ElementOrder order) throw(SAL } CORBA::Long SMESH_Mesh_i::NbFacesOfOrder(SMESH::ElementOrder order) - throw(SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4616,7 +4571,6 @@ CORBA::Long SMESH_Mesh_i::NbFacesOfOrder(SMESH::ElementOrder order) } CORBA::Long SMESH_Mesh_i::NbTrianglesOfOrder(SMESH::ElementOrder order) - throw(SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4626,7 +4580,6 @@ CORBA::Long SMESH_Mesh_i::NbTrianglesOfOrder(SMESH::ElementOrder order) } CORBA::Long SMESH_Mesh_i::NbQuadranglesOfOrder(SMESH::ElementOrder order) - throw(SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4637,7 +4590,7 @@ CORBA::Long SMESH_Mesh_i::NbQuadranglesOfOrder(SMESH::ElementOrder order) //============================================================================= -CORBA::Long SMESH_Mesh_i::NbVolumes()throw(SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbVolumes() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4646,7 +4599,7 @@ CORBA::Long SMESH_Mesh_i::NbVolumes()throw(SALOME::SALOME_Exception) return _impl->NbVolumes(); } -CORBA::Long SMESH_Mesh_i::NbTetras()throw(SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbTetras() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4655,7 +4608,7 @@ CORBA::Long SMESH_Mesh_i::NbTetras()throw(SALOME::SALOME_Exception) return _impl->NbTetras(); } -CORBA::Long SMESH_Mesh_i::NbHexas()throw(SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbHexas() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4664,7 +4617,7 @@ CORBA::Long SMESH_Mesh_i::NbHexas()throw(SALOME::SALOME_Exception) return _impl->NbHexas(); } -CORBA::Long SMESH_Mesh_i::NbTriQuadraticHexas()throw(SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbTriQuadraticHexas() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4673,7 +4626,7 @@ CORBA::Long SMESH_Mesh_i::NbTriQuadraticHexas()throw(SALOME::SALOME_Exception) return _impl->NbTriQuadraticHexas(); } -CORBA::Long SMESH_Mesh_i::NbPyramids()throw(SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbPyramids() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4682,7 +4635,7 @@ CORBA::Long SMESH_Mesh_i::NbPyramids()throw(SALOME::SALOME_Exception) return _impl->NbPyramids(); } -CORBA::Long SMESH_Mesh_i::NbPrisms()throw(SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbPrisms() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4691,7 +4644,7 @@ CORBA::Long SMESH_Mesh_i::NbPrisms()throw(SALOME::SALOME_Exception) return _impl->NbPrisms(); } -CORBA::Long SMESH_Mesh_i::NbHexagonalPrisms()throw(SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbHexagonalPrisms() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4700,7 +4653,7 @@ CORBA::Long SMESH_Mesh_i::NbHexagonalPrisms()throw(SALOME::SALOME_Exception) return _impl->NbHexagonalPrisms(); } -CORBA::Long SMESH_Mesh_i::NbPolyhedrons()throw(SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbPolyhedrons() { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4710,7 +4663,6 @@ CORBA::Long SMESH_Mesh_i::NbPolyhedrons()throw(SALOME::SALOME_Exception) } CORBA::Long SMESH_Mesh_i::NbVolumesOfOrder(SMESH::ElementOrder order) - throw(SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4720,7 +4672,6 @@ CORBA::Long SMESH_Mesh_i::NbVolumesOfOrder(SMESH::ElementOrder order) } CORBA::Long SMESH_Mesh_i::NbTetrasOfOrder(SMESH::ElementOrder order) - throw(SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4730,7 +4681,6 @@ CORBA::Long SMESH_Mesh_i::NbTetrasOfOrder(SMESH::ElementOrder order) } CORBA::Long SMESH_Mesh_i::NbHexasOfOrder(SMESH::ElementOrder order) - throw(SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4740,7 +4690,6 @@ CORBA::Long SMESH_Mesh_i::NbHexasOfOrder(SMESH::ElementOrder order) } CORBA::Long SMESH_Mesh_i::NbPyramidsOfOrder(SMESH::ElementOrder order) - throw(SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4750,7 +4699,6 @@ CORBA::Long SMESH_Mesh_i::NbPyramidsOfOrder(SMESH::ElementOrder order) } CORBA::Long SMESH_Mesh_i::NbPrismsOfOrder(SMESH::ElementOrder order) - throw(SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4765,7 +4713,7 @@ CORBA::Long SMESH_Mesh_i::NbPrismsOfOrder(SMESH::ElementOrder order) */ //============================================================================= -CORBA::Long SMESH_Mesh_i::NbSubMesh()throw(SALOME::SALOME_Exception) +CORBA::Long SMESH_Mesh_i::NbSubMesh() { Unexpect aCatch(SALOME_SalomeException); return _mapSubMesh_i.size(); @@ -4802,7 +4750,6 @@ SMESH::long_array* SMESH_Mesh_i::GetIDs() //============================================================================= SMESH::long_array* SMESH_Mesh_i::GetElementsId() - throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4831,7 +4778,6 @@ SMESH::long_array* SMESH_Mesh_i::GetElementsId() //============================================================================= SMESH::long_array* SMESH_Mesh_i::GetElementsByType( SMESH::ElementType theElemType ) - throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4871,7 +4817,6 @@ SMESH::long_array* SMESH_Mesh_i::GetElementsByType( SMESH::ElementType theElemTy //============================================================================= SMESH::long_array* SMESH_Mesh_i::GetNodesId() - throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); if ( _preMeshInfo ) @@ -4899,7 +4844,6 @@ SMESH::long_array* SMESH_Mesh_i::GetNodesId() //============================================================================= SMESH::ElementType SMESH_Mesh_i::GetElementType( const CORBA::Long id, const bool iselem ) - throw (SALOME::SALOME_Exception) { SMESH::ElementType type = SMESH::ALL; SMESH_TRY; @@ -4921,7 +4865,6 @@ SMESH::ElementType SMESH_Mesh_i::GetElementType( const CORBA::Long id, const boo //============================================================================= SMESH::EntityType SMESH_Mesh_i::GetElementGeomType( const CORBA::Long id ) - throw (SALOME::SALOME_Exception) { if ( _preMeshInfo ) _preMeshInfo->FullLoadFromFile(); @@ -4940,7 +4883,6 @@ SMESH::EntityType SMESH_Mesh_i::GetElementGeomType( const CORBA::Long id ) //============================================================================= SMESH::GeometryType SMESH_Mesh_i::GetElementShape( const CORBA::Long id ) - throw (SALOME::SALOME_Exception) { if ( _preMeshInfo ) _preMeshInfo->FullLoadFromFile(); @@ -4959,7 +4901,6 @@ SMESH::GeometryType SMESH_Mesh_i::GetElementShape( const CORBA::Long id ) //============================================================================= SMESH::long_array* SMESH_Mesh_i::GetSubMeshElementsId(const CORBA::Long ShapeID) - throw (SALOME::SALOME_Exception) { SMESH::long_array_var aResult = new SMESH::long_array(); @@ -4996,7 +4937,6 @@ SMESH::long_array* SMESH_Mesh_i::GetSubMeshElementsId(const CORBA::Long ShapeID) SMESH::long_array* SMESH_Mesh_i::GetSubMeshNodesId(const CORBA::Long ShapeID, CORBA::Boolean all) - throw (SALOME::SALOME_Exception) { SMESH::long_array_var aResult = new SMESH::long_array(); @@ -5048,7 +4988,6 @@ SMESH::long_array* SMESH_Mesh_i::GetSubMeshNodesId(const CORBA::Long ShapeID, //============================================================================= SMESH::ElementType SMESH_Mesh_i::GetSubMeshElementType(const CORBA::Long ShapeID) - throw (SALOME::SALOME_Exception) { SMESH::ElementType type = SMESH::ALL; @@ -5708,7 +5647,6 @@ SMESH::double_array* SMESH_Mesh_i::BaryCenter(const CORBA::Long id) SMESH::ListOfGroups* SMESH_Mesh_i::MakeGroupsOfBadInputElements( int theSubShapeID, const char* theGroupName ) - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); @@ -5832,7 +5770,7 @@ void SMESH_Mesh_i::CreateGroupServants() // register CORBA object for persistence int nextId = _gen_i->RegisterObject( groupVar ); if(MYDEBUG) { MESSAGE( "Add group to map with id = "<< nextId); } - else { nextId = 0; } // avoid "unused variable" warning in release mode + else { (void)nextId; } // avoid "unused variable" warning in release mode // publishing the groups in the study GEOM::GEOM_Object_var shapeVar = _gen_i->ShapeToGeomObject( shape ); @@ -6493,7 +6431,7 @@ class SMESH_DimHyp TopTools_MapIteratorOfMapOfShape anItr( theToCheck ); for (; !isShared && anItr.More(); anItr.Next() ) { - const TopoDS_Shape aSubSh = anItr.Key(); + const TopoDS_Shape& aSubSh = anItr.Key(); // check for case when concurrent dimensions are same isShared = theToFind.Contains( aSubSh ); // check for sub-shape with concurrent dimension diff --git a/src/SMESH_I/SMESH_Mesh_i.hxx b/src/SMESH_I/SMESH_Mesh_i.hxx index 6abfb2215..56edeee76 100644 --- a/src/SMESH_I/SMESH_Mesh_i.hxx +++ b/src/SMESH_I/SMESH_Mesh_i.hxx @@ -65,131 +65,100 @@ public: // --- CORBA - void SetShape( GEOM::GEOM_Object_ptr theShapeObject ) - throw (SALOME::SALOME_Exception); + void SetShape( GEOM::GEOM_Object_ptr theShapeObject ); - CORBA::Boolean HasShapeToMesh() - throw (SALOME::SALOME_Exception); + CORBA::Boolean HasShapeToMesh(); - GEOM::GEOM_Object_ptr GetShapeToMesh() - throw (SALOME::SALOME_Exception); + GEOM::GEOM_Object_ptr GetShapeToMesh(); - virtual void ReplaceShape(GEOM::GEOM_Object_ptr theNewGeom) - throw (SALOME::SALOME_Exception); + virtual void ReplaceShape(GEOM::GEOM_Object_ptr theNewGeom); - CORBA::Boolean IsLoaded() - throw (SALOME::SALOME_Exception); + CORBA::Boolean IsLoaded(); - void Load() - throw (SALOME::SALOME_Exception); + void Load(); - void Clear() - throw (SALOME::SALOME_Exception); + void Clear(); - void ClearSubMesh(CORBA::Long ShapeID) - throw (SALOME::SALOME_Exception); + void ClearSubMesh(CORBA::Long ShapeID); SMESH::Hypothesis_Status AddHypothesis(GEOM::GEOM_Object_ptr aSubShape, SMESH::SMESH_Hypothesis_ptr anHyp, - CORBA::String_out anErrorText) - throw (SALOME::SALOME_Exception); + CORBA::String_out anErrorText); SMESH::Hypothesis_Status RemoveHypothesis(GEOM::GEOM_Object_ptr aSubShape, - SMESH::SMESH_Hypothesis_ptr anHyp) - throw (SALOME::SALOME_Exception); + SMESH::SMESH_Hypothesis_ptr anHyp); - SMESH::ListOfHypothesis* GetHypothesisList(GEOM::GEOM_Object_ptr aSubShape) - throw (SALOME::SALOME_Exception); + SMESH::ListOfHypothesis* GetHypothesisList(GEOM::GEOM_Object_ptr aSubShape); - SMESH::submesh_array* GetSubMeshes() - throw (SALOME::SALOME_Exception); + SMESH::submesh_array* GetSubMeshes(); - SMESH::SMESH_subMesh_ptr GetSubMesh(GEOM::GEOM_Object_ptr aSubShape, const char* theName) - throw (SALOME::SALOME_Exception); + SMESH::SMESH_subMesh_ptr GetSubMesh(GEOM::GEOM_Object_ptr aSubShape, const char* theName); - void RemoveSubMesh( SMESH::SMESH_subMesh_ptr theSubMesh ) - throw (SALOME::SALOME_Exception); + void RemoveSubMesh( SMESH::SMESH_subMesh_ptr theSubMesh ); - SMESH::SMESH_Group_ptr CreateGroup( SMESH::ElementType theElemType, const char* theName ) - throw (SALOME::SALOME_Exception); + SMESH::SMESH_Group_ptr CreateGroup( SMESH::ElementType theElemType, const char* theName ); SMESH::SMESH_GroupOnGeom_ptr CreateGroupFromGEOM(SMESH::ElementType theElemType, const char* theName, - GEOM::GEOM_Object_ptr theGeomObj ) - throw (SALOME::SALOME_Exception); + GEOM::GEOM_Object_ptr theGeomObj ); SMESH::SMESH_GroupOnFilter_ptr CreateGroupFromFilter(SMESH::ElementType theElemType, const char* theName, - SMESH::Filter_ptr theFilter ) - throw (SALOME::SALOME_Exception); + SMESH::Filter_ptr theFilter ); - void RemoveGroup( SMESH::SMESH_GroupBase_ptr theGroup ) - throw (SALOME::SALOME_Exception); + void RemoveGroup( SMESH::SMESH_GroupBase_ptr theGroup ); - void RemoveGroupWithContents( SMESH::SMESH_GroupBase_ptr theGroup ) - throw (SALOME::SALOME_Exception); + void RemoveGroupWithContents( SMESH::SMESH_GroupBase_ptr theGroup ); - SMESH::ListOfGroups* GetGroups() - throw (SALOME::SALOME_Exception); + SMESH::ListOfGroups* GetGroups(); - CORBA::Long NbGroups() - throw (SALOME::SALOME_Exception); + CORBA::Long NbGroups(); SMESH::SMESH_Group_ptr UnionGroups( SMESH::SMESH_GroupBase_ptr theGroup1, SMESH::SMESH_GroupBase_ptr theGroup2, - const char* theName ) - throw (SALOME::SALOME_Exception); + const char* theName ); SMESH::SMESH_Group_ptr UnionListOfGroups( const SMESH::ListOfGroups& theGroups, - const char* theName) - throw (SALOME::SALOME_Exception); + const char* theName); SMESH::SMESH_Group_ptr IntersectGroups( SMESH::SMESH_GroupBase_ptr theGroup1, SMESH::SMESH_GroupBase_ptr theGroup2, - const char* theName ) - throw (SALOME::SALOME_Exception); + const char* theName ); SMESH::SMESH_Group_ptr IntersectListOfGroups( const SMESH::ListOfGroups& theGroups, - const char* theName ) - throw (SALOME::SALOME_Exception); + const char* theName ); SMESH::SMESH_Group_ptr CutGroups( SMESH::SMESH_GroupBase_ptr theGroup1, SMESH::SMESH_GroupBase_ptr theGroup2, - const char* theName ) - throw (SALOME::SALOME_Exception); + const char* theName ); SMESH::SMESH_Group_ptr CutListOfGroups( const SMESH::ListOfGroups& theMainGroups, const SMESH::ListOfGroups& theToolGroups, - const char* theName ) - throw (SALOME::SALOME_Exception); + const char* theName ); SMESH::SMESH_Group_ptr CreateDimGroup( const SMESH::ListOfIDSources& theGroups, SMESH::ElementType theElemType, const char* theName, SMESH::NB_COMMON_NODES_ENUM theNbCommonNodes, - CORBA::Boolean theUnderlyingOnly ) - throw (SALOME::SALOME_Exception); + CORBA::Boolean theUnderlyingOnly ); SMESH::ListOfGroups* FaceGroupsSeparatedByEdges( CORBA::Double theSharpAngle, CORBA::Boolean theCreateEdges, - CORBA::Boolean theUseExistingEdges ) - throw (SALOME::SALOME_Exception); + CORBA::Boolean theUseExistingEdges ); - SMESH::SMESH_Group_ptr ConvertToStandalone( SMESH::SMESH_GroupBase_ptr theGroupOn ) - throw (SALOME::SALOME_Exception); + SMESH::SMESH_Group_ptr ConvertToStandalone( SMESH::SMESH_GroupBase_ptr theGroupOn ); - SMESH::log_array* GetLog(CORBA::Boolean clearAfterGet) - throw (SALOME::SALOME_Exception); + SMESH::log_array* GetLog(CORBA::Boolean clearAfterGet); - SMESH::SMESH_MeshEditor_ptr GetMeshEditor() throw (SALOME::SALOME_Exception); + SMESH::SMESH_MeshEditor_ptr GetMeshEditor(); - SMESH::SMESH_MeshEditor_ptr GetMeshEditPreviewer() throw (SALOME::SALOME_Exception); + SMESH::SMESH_MeshEditor_ptr GetMeshEditPreviewer(); - CORBA::Boolean HasModificationsToDiscard() throw (SALOME::SALOME_Exception); + CORBA::Boolean HasModificationsToDiscard(); - void ClearLog() throw (SALOME::SALOME_Exception); + void ClearLog(); - CORBA::Long GetId() throw (SALOME::SALOME_Exception); + CORBA::Long GetId(); // --- C++ interface @@ -198,35 +167,28 @@ public: SMESH_Gen_i* GetGen() { return _gen_i; } - int ImportUNVFile( const char* theFileName ) - throw (SALOME::SALOME_Exception); + int ImportUNVFile( const char* theFileName ); - int ImportSTLFile( const char* theFileName ) - throw (SALOME::SALOME_Exception); + int ImportSTLFile( const char* theFileName ); SMESH::ComputeError* ImportGMFFile( const char* theFileName, - bool theMakeRequiredGroups) - throw (SALOME::SALOME_Exception); + bool theMakeRequiredGroups); /*! * consult DriverMED_R_SMESHDS_Mesh::ReadStatus for returned value */ - SMESH::DriverMED_ReadStatus ImportMEDFile( const char* theFileName, const char* theMeshName ) - throw (SALOME::SALOME_Exception); + SMESH::DriverMED_ReadStatus ImportMEDFile( const char* theFileName, const char* theMeshName ); SMESH::DriverMED_ReadStatus ImportCGNSFile( const char* theFileName, const int theMeshIndex, - std::string& theMeshName) - throw (SALOME::SALOME_Exception); + std::string& theMeshName); /*! * Auto color */ - void SetAutoColor(CORBA::Boolean theAutoColor) - throw (SALOME::SALOME_Exception); + void SetAutoColor(CORBA::Boolean theAutoColor); - CORBA::Boolean GetAutoColor() - throw (SALOME::SALOME_Exception); + CORBA::Boolean GetAutoColor(); /*! Check group names for duplications. * Consider maximum group name length stored in MED file. @@ -248,20 +210,20 @@ public: CORBA::Boolean auto_groups, CORBA::Long version, CORBA::Boolean overwrite, - CORBA::Boolean autoDimension = true) throw (SALOME::SALOME_Exception); + CORBA::Boolean autoDimension = true); - void ExportSAUV( const char* file, CORBA::Boolean auto_groups ) throw (SALOME::SALOME_Exception); + void ExportSAUV( const char* file, CORBA::Boolean auto_groups ); - void ExportDAT( const char* file ) throw (SALOME::SALOME_Exception); - void ExportUNV( const char* file ) throw (SALOME::SALOME_Exception); - void ExportSTL( const char* file, bool isascii ) throw (SALOME::SALOME_Exception); + void ExportDAT( const char* file ); + void ExportUNV( const char* file ); + void ExportSTL( const char* file, bool isascii ); void ExportCGNS(SMESH::SMESH_IDSource_ptr meshPart, const char* file, CORBA::Boolean overwrite, - CORBA::Boolean groupElemsByType) throw (SALOME::SALOME_Exception); + CORBA::Boolean groupElemsByType); void ExportGMF(SMESH::SMESH_IDSource_ptr meshPart, const char* file, - CORBA::Boolean withRequiredGroups) throw (SALOME::SALOME_Exception); + CORBA::Boolean withRequiredGroups); void ExportPartToMED(SMESH::SMESH_IDSource_ptr meshPart, const char* file, @@ -271,151 +233,111 @@ public: CORBA::Boolean autoDim, const GEOM::ListOfFields& fields, const char* geomAssocFields, - CORBA::Double ZTolerance) throw (SALOME::SALOME_Exception); + CORBA::Double ZTolerance); void ExportPartToDAT(SMESH::SMESH_IDSource_ptr meshPart, - const char* file) throw (SALOME::SALOME_Exception); + const char* file); void ExportPartToUNV(SMESH::SMESH_IDSource_ptr meshPart, - const char* file) throw (SALOME::SALOME_Exception); + const char* file); void ExportPartToSTL(SMESH::SMESH_IDSource_ptr meshPart, const char* file, - CORBA::Boolean isascii) throw (SALOME::SALOME_Exception); + CORBA::Boolean isascii); CORBA::Double GetComputeProgress(); - CORBA::Long NbNodes() - throw (SALOME::SALOME_Exception); + CORBA::Long NbNodes(); - CORBA::Long NbElements() - throw (SALOME::SALOME_Exception); + CORBA::Long NbElements(); - CORBA::Long Nb0DElements() - throw (SALOME::SALOME_Exception); + CORBA::Long Nb0DElements(); - CORBA::Long NbBalls() - throw (SALOME::SALOME_Exception); + CORBA::Long NbBalls(); - CORBA::Long NbEdges() - throw (SALOME::SALOME_Exception); + CORBA::Long NbEdges(); - CORBA::Long NbEdgesOfOrder(SMESH::ElementOrder order) - throw (SALOME::SALOME_Exception); + CORBA::Long NbEdgesOfOrder(SMESH::ElementOrder order); - CORBA::Long NbFaces() - throw (SALOME::SALOME_Exception); + CORBA::Long NbFaces(); - CORBA::Long NbFacesOfOrder(SMESH::ElementOrder order) - throw (SALOME::SALOME_Exception); + CORBA::Long NbFacesOfOrder(SMESH::ElementOrder order); - CORBA::Long NbTriangles() - throw (SALOME::SALOME_Exception); + CORBA::Long NbTriangles(); - CORBA::Long NbTrianglesOfOrder(SMESH::ElementOrder order) - throw (SALOME::SALOME_Exception); + CORBA::Long NbTrianglesOfOrder(SMESH::ElementOrder order); - CORBA::Long NbBiQuadTriangles() - throw (SALOME::SALOME_Exception); + CORBA::Long NbBiQuadTriangles(); - CORBA::Long NbQuadrangles() - throw (SALOME::SALOME_Exception); + CORBA::Long NbQuadrangles(); - CORBA::Long NbQuadranglesOfOrder(SMESH::ElementOrder order) - throw (SALOME::SALOME_Exception); + CORBA::Long NbQuadranglesOfOrder(SMESH::ElementOrder order); - CORBA::Long NbBiQuadQuadrangles() - throw (SALOME::SALOME_Exception); + CORBA::Long NbBiQuadQuadrangles(); - CORBA::Long NbPolygons() - throw (SALOME::SALOME_Exception); + CORBA::Long NbPolygons(); - CORBA::Long NbPolygonsOfOrder(SMESH::ElementOrder order = SMESH::ORDER_ANY) - throw (SALOME::SALOME_Exception); + CORBA::Long NbPolygonsOfOrder(SMESH::ElementOrder order = SMESH::ORDER_ANY); - CORBA::Long NbVolumes() - throw (SALOME::SALOME_Exception); + CORBA::Long NbVolumes(); - CORBA::Long NbVolumesOfOrder(SMESH::ElementOrder order) - throw (SALOME::SALOME_Exception); + CORBA::Long NbVolumesOfOrder(SMESH::ElementOrder order); - CORBA::Long NbTetras() - throw (SALOME::SALOME_Exception); + CORBA::Long NbTetras(); - CORBA::Long NbTetrasOfOrder(SMESH::ElementOrder order) - throw (SALOME::SALOME_Exception); + CORBA::Long NbTetrasOfOrder(SMESH::ElementOrder order); - CORBA::Long NbHexas() - throw (SALOME::SALOME_Exception); + CORBA::Long NbHexas(); - CORBA::Long NbHexasOfOrder(SMESH::ElementOrder order) - throw (SALOME::SALOME_Exception); + CORBA::Long NbHexasOfOrder(SMESH::ElementOrder order); - CORBA::Long NbTriQuadraticHexas() - throw (SALOME::SALOME_Exception); + CORBA::Long NbTriQuadraticHexas(); - CORBA::Long NbPyramids() - throw (SALOME::SALOME_Exception); + CORBA::Long NbPyramids(); - CORBA::Long NbPyramidsOfOrder(SMESH::ElementOrder order) - throw (SALOME::SALOME_Exception); + CORBA::Long NbPyramidsOfOrder(SMESH::ElementOrder order); - CORBA::Long NbPrisms() - throw (SALOME::SALOME_Exception); + CORBA::Long NbPrisms(); - CORBA::Long NbPrismsOfOrder(SMESH::ElementOrder order) - throw (SALOME::SALOME_Exception); + CORBA::Long NbPrismsOfOrder(SMESH::ElementOrder order); - CORBA::Long NbHexagonalPrisms() - throw (SALOME::SALOME_Exception); + CORBA::Long NbHexagonalPrisms(); - CORBA::Long NbPolyhedrons() - throw (SALOME::SALOME_Exception); + CORBA::Long NbPolyhedrons(); - CORBA::Long NbSubMesh() - throw (SALOME::SALOME_Exception); + CORBA::Long NbSubMesh(); - SMESH::long_array* GetElementsId() - throw (SALOME::SALOME_Exception); + SMESH::long_array* GetElementsId(); - SMESH::long_array* GetElementsByType( SMESH::ElementType theElemType ) - throw (SALOME::SALOME_Exception); + SMESH::long_array* GetElementsByType( SMESH::ElementType theElemType ); - SMESH::long_array* GetNodesId() - throw (SALOME::SALOME_Exception); + SMESH::long_array* GetNodesId(); - SMESH::ElementType GetElementType( CORBA::Long id, bool iselem ) - throw (SALOME::SALOME_Exception); + SMESH::ElementType GetElementType( CORBA::Long id, bool iselem ); - SMESH::EntityType GetElementGeomType( CORBA::Long id ) - throw (SALOME::SALOME_Exception); + SMESH::EntityType GetElementGeomType( CORBA::Long id ); - SMESH::GeometryType GetElementShape( CORBA::Long id ) - throw (SALOME::SALOME_Exception); + SMESH::GeometryType GetElementShape( CORBA::Long id ); /*! * Returns ID of elements for given submesh */ - SMESH::long_array* GetSubMeshElementsId(CORBA::Long ShapeID) - throw (SALOME::SALOME_Exception); + SMESH::long_array* GetSubMeshElementsId(CORBA::Long ShapeID); /*! * Returns ID of nodes for given submesh * If param all==true - returns all nodes, else - * returns only nodes on shapes. */ - SMESH::long_array* GetSubMeshNodesId(CORBA::Long ShapeID, CORBA::Boolean all) - throw (SALOME::SALOME_Exception); + SMESH::long_array* GetSubMeshNodesId(CORBA::Long ShapeID, CORBA::Boolean all); /*! * Returns type of elements for given submesh */ - SMESH::ElementType GetSubMeshElementType(CORBA::Long ShapeID) - throw (SALOME::SALOME_Exception); + SMESH::ElementType GetSubMeshElementType(CORBA::Long ShapeID); char* Dump(); // Create groups of elements preventing computation of a sub-shape SMESH::ListOfGroups* MakeGroupsOfBadInputElements( int theSubShapeID, - const char* theGroupName) - throw (SALOME::SALOME_Exception); + const char* theGroupName); // =================================================== // Internal methods not available through CORBA diff --git a/src/SMESH_I/SMESH_NoteBook.cxx b/src/SMESH_I/SMESH_NoteBook.cxx index 29b6d0060..7994cf1f1 100644 --- a/src/SMESH_I/SMESH_NoteBook.cxx +++ b/src/SMESH_I/SMESH_NoteBook.cxx @@ -284,7 +284,7 @@ void SMESH_NoteBook::ReplaceVariables() const char* varIndexPtr = cmdStr.ToCString() + pos; if ( '0' <= *varIndexPtr && *varIndexPtr <= '9' ) varIndex = atoi( varIndexPtr ); - if ( 0 <= varIndex && varIndex < vars.size() && !vars[varIndex].empty() ) + if ( 0 <= (int)varIndex && varIndex < vars.size() && !vars[varIndex].empty() ) { // replace '$VarIndex$' either by var name of var value const char var0 = vars[varIndex][0]; diff --git a/src/SMESH_I/SMESH_PreMeshInfo.cxx b/src/SMESH_I/SMESH_PreMeshInfo.cxx index d501a0b8b..7514ad215 100644 --- a/src/SMESH_I/SMESH_PreMeshInfo.cxx +++ b/src/SMESH_I/SMESH_PreMeshInfo.cxx @@ -72,7 +72,7 @@ namespace */ //================================================================================ - void meshInfoLoaded( SMESH_Mesh_i* mesh ) + void meshInfoLoaded( SMESH_Mesh_i* /*mesh*/ ) { theMeshCounter++; } @@ -82,7 +82,7 @@ namespace */ //================================================================================ - void filesNoMoreNeeded(SMESH_Mesh_i* mesh, + void filesNoMoreNeeded(SMESH_Mesh_i* /*mesh*/, std::string medFile, std::string hdfFile) { diff --git a/src/SMESH_I/SMESH_PythonDump.cxx b/src/SMESH_I/SMESH_PythonDump.cxx index a09766949..f8496d870 100644 --- a/src/SMESH_I/SMESH_PythonDump.cxx +++ b/src/SMESH_I/SMESH_PythonDump.cxx @@ -367,7 +367,7 @@ namespace SMESH TPythonDump& TPythonDump:: - operator<<(SMESH::FilterManager_i* theArg) + operator<<(SMESH::FilterManager_i* /*theArg*/) { myStream<<"aFilterManager"; return *this; @@ -448,13 +448,13 @@ namespace SMESH TPythonDump& TPythonDump:: - operator<<(SMESH::Measurements_i* theArg) + operator<<(SMESH::Measurements_i* /*theArg*/) { myStream<<"aMeasurements"; return *this; } - TPythonDump& TPythonDump:: operator<<(SMESH_Gen_i* theArg) + TPythonDump& TPythonDump:: operator<<(SMESH_Gen_i* /*theArg*/) { myStream << SMESHGenName(); return *this; } @@ -671,6 +671,8 @@ namespace SMESH { #ifdef _DEBUG_ std::cout << "Exception in SMESH_Gen_i::DumpPython(): " << text << std::endl; +#else + (void)text; // todo: unused in release mode #endif } diff --git a/src/SMESH_I/SMESH_subMesh_i.cxx b/src/SMESH_I/SMESH_subMesh_i.cxx index fe16360bf..5982ff089 100644 --- a/src/SMESH_I/SMESH_subMesh_i.cxx +++ b/src/SMESH_I/SMESH_subMesh_i.cxx @@ -141,7 +141,6 @@ bool getSubMeshes(::SMESH_subMesh* theSubMesh, //============================================================================= CORBA::Long SMESH_subMesh_i::GetNumberOfElements() - throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); @@ -172,7 +171,6 @@ CORBA::Long SMESH_subMesh_i::GetNumberOfElements() //============================================================================= CORBA::Long SMESH_subMesh_i::GetNumberOfNodes(CORBA::Boolean all) - throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); @@ -220,7 +218,6 @@ CORBA::Long SMESH_subMesh_i::GetNumberOfNodes(CORBA::Boolean all) //============================================================================= SMESH::long_array* SMESH_subMesh_i::GetElementsId() - throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); @@ -265,7 +262,6 @@ SMESH::long_array* SMESH_subMesh_i::GetElementsId() //============================================================================= SMESH::long_array* SMESH_subMesh_i::GetElementsByType( SMESH::ElementType theElemType ) - throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); @@ -351,7 +347,6 @@ SMESH::long_array* SMESH_subMesh_i::GetElementsByType( SMESH::ElementType theEle //============================================================================= SMESH::long_array* SMESH_subMesh_i::GetNodesId() - throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); @@ -366,7 +361,6 @@ SMESH::long_array* SMESH_subMesh_i::GetNodesId() //============================================================================= SMESH::SMESH_Mesh_ptr SMESH_subMesh_i::GetFather() - throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); return _mesh_i->_this(); @@ -389,7 +383,6 @@ CORBA::Long SMESH_subMesh_i::GetId() //======================================================================= GEOM::GEOM_Object_ptr SMESH_subMesh_i::GetSubShape() - throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); GEOM::GEOM_Object_var aShapeObj; @@ -428,7 +421,6 @@ SMESH::long_array* SMESH_subMesh_i::GetIDs() */ //============================================================================= SMESH::ElementType SMESH_subMesh_i::GetElementType( const CORBA::Long id, const bool iselem ) - throw (SALOME::SALOME_Exception) { if ( _preMeshInfo ) _preMeshInfo->FullLoadFromFile(); @@ -607,7 +599,6 @@ SMESH_Invalid_subMesh_i::SMESH_Invalid_subMesh_i( PortableServer::POA_ptr thePOA //======================================================================= GEOM::GEOM_Object_ptr SMESH_Invalid_subMesh_i::GetSubShape() - throw (SALOME::SALOME_Exception) { return GEOM::GEOM_Object::_duplicate( _geom ); } diff --git a/src/SMESH_I/SMESH_subMesh_i.hxx b/src/SMESH_I/SMESH_subMesh_i.hxx index 8cb71469e..97c940b99 100644 --- a/src/SMESH_I/SMESH_subMesh_i.hxx +++ b/src/SMESH_I/SMESH_subMesh_i.hxx @@ -53,29 +53,21 @@ public: int localId ); ~SMESH_subMesh_i(); - CORBA::Long GetNumberOfElements() - throw (SALOME::SALOME_Exception); + CORBA::Long GetNumberOfElements(); - CORBA::Long GetNumberOfNodes( CORBA::Boolean all ) - throw (SALOME::SALOME_Exception); + CORBA::Long GetNumberOfNodes( CORBA::Boolean all ); - SMESH::long_array* GetElementsId() - throw (SALOME::SALOME_Exception); + SMESH::long_array* GetElementsId(); - SMESH::long_array* GetElementsByType( SMESH::ElementType theElemType ) - throw (SALOME::SALOME_Exception); + SMESH::long_array* GetElementsByType( SMESH::ElementType theElemType ); - SMESH::ElementType GetElementType( CORBA::Long id, bool iselem ) - throw (SALOME::SALOME_Exception); + SMESH::ElementType GetElementType( CORBA::Long id, bool iselem ); - SMESH::long_array* GetNodesId() - throw (SALOME::SALOME_Exception); + SMESH::long_array* GetNodesId(); - SMESH::SMESH_Mesh_ptr GetFather() - throw (SALOME::SALOME_Exception); + SMESH::SMESH_Mesh_ptr GetFather(); - GEOM::GEOM_Object_ptr GetSubShape() - throw (SALOME::SALOME_Exception); + GEOM::GEOM_Object_ptr GetSubShape(); CORBA::Long GetId(); @@ -144,8 +136,7 @@ class SMESH_I_EXPORT SMESH_Invalid_subMesh_i: int localId, GEOM::GEOM_Object_ptr shape); - virtual GEOM::GEOM_Object_ptr GetSubShape() - throw (SALOME::SALOME_Exception); + virtual GEOM::GEOM_Object_ptr GetSubShape(); protected: diff --git a/src/StdMeshers/StdMeshers_Adaptive1D.cxx b/src/StdMeshers/StdMeshers_Adaptive1D.cxx index 965d684a6..c44886473 100644 --- a/src/StdMeshers/StdMeshers_Adaptive1D.cxx +++ b/src/StdMeshers/StdMeshers_Adaptive1D.cxx @@ -443,7 +443,7 @@ namespace // internal utils double a[3]; bool isDone[3]; double size = -1., maxLinkLen; - int jLongest; + int jLongest = 0; //int nbLinks = 0; for ( int i = 1; i <= myPolyTrias->Upper(); ++i ) @@ -937,7 +937,6 @@ StdMeshers_Adaptive1D::~StdMeshers_Adaptive1D() //function : SetDeflection //purpose : void StdMeshers_Adaptive1D::SetDeflection(double value) - throw(SALOME_Exception) { if (value <= std::numeric_limits::min() ) throw SALOME_Exception("Deflection must be greater that zero"); @@ -951,7 +950,6 @@ void StdMeshers_Adaptive1D::SetDeflection(double value) //function : SetMinSize //purpose : Sets minimal allowed segment length void StdMeshers_Adaptive1D::SetMinSize(double minSize) - throw(SALOME_Exception) { if (minSize <= std::numeric_limits::min() ) throw SALOME_Exception("Min size must be greater that zero"); @@ -966,7 +964,6 @@ void StdMeshers_Adaptive1D::SetMinSize(double minSize) //function : SetMaxSize //purpose : Sets maximal allowed segment length void StdMeshers_Adaptive1D::SetMaxSize(double maxSize) - throw(SALOME_Exception) { if (maxSize <= std::numeric_limits::min() ) throw SALOME_Exception("Max size must be greater that zero"); diff --git a/src/StdMeshers/StdMeshers_Adaptive1D.hxx b/src/StdMeshers/StdMeshers_Adaptive1D.hxx index 6327a630a..3fc573469 100644 --- a/src/StdMeshers/StdMeshers_Adaptive1D.hxx +++ b/src/StdMeshers/StdMeshers_Adaptive1D.hxx @@ -43,20 +43,20 @@ class STDMESHERS_EXPORT StdMeshers_Adaptive1D : public SMESH_Hypothesis /*! * Sets minimal allowed segment length */ - void SetMinSize( double minSegLen ) throw (SALOME_Exception); + void SetMinSize( double minSegLen ); double GetMinSize() const { return myMinSize; } /*! * Sets maximal allowed segment length */ - void SetMaxSize( double maxSegLen ) throw (SALOME_Exception); + void SetMaxSize( double maxSegLen ); double GetMaxSize() const { return myMaxSize; } /*! * Sets parameter value, * i.e. a maximal allowed distance between a segment and an edge. */ - void SetDeflection(double value) throw(SALOME_Exception); + void SetDeflection(double value); double GetDeflection() const { return myDeflection; } virtual std::ostream & SaveTo(std::ostream & save); diff --git a/src/StdMeshers/StdMeshers_Arithmetic1D.cxx b/src/StdMeshers/StdMeshers_Arithmetic1D.cxx index 2a50a9b59..8112c1477 100644 --- a/src/StdMeshers/StdMeshers_Arithmetic1D.cxx +++ b/src/StdMeshers/StdMeshers_Arithmetic1D.cxx @@ -74,7 +74,6 @@ StdMeshers_Arithmetic1D::~StdMeshers_Arithmetic1D() //============================================================================= void StdMeshers_Arithmetic1D::SetLength(double length, bool isStartLength) - throw(SALOME_Exception) { if ( (isStartLength ? _begLength : _endLength) != length ) { if (length <= 0) diff --git a/src/StdMeshers/StdMeshers_Arithmetic1D.hxx b/src/StdMeshers/StdMeshers_Arithmetic1D.hxx index bcfbc5ac3..f6c700c48 100644 --- a/src/StdMeshers/StdMeshers_Arithmetic1D.hxx +++ b/src/StdMeshers/StdMeshers_Arithmetic1D.hxx @@ -42,7 +42,7 @@ public: StdMeshers_Arithmetic1D(int hypId, SMESH_Gen* gen); virtual ~StdMeshers_Arithmetic1D(); - void SetLength(double length, bool isStartLength) throw(SALOME_Exception); + void SetLength(double length, bool isStartLength); double GetLength(bool isStartLength) const; diff --git a/src/StdMeshers/StdMeshers_AutomaticLength.cxx b/src/StdMeshers/StdMeshers_AutomaticLength.cxx index 585e9193b..b9964faef 100644 --- a/src/StdMeshers/StdMeshers_AutomaticLength.cxx +++ b/src/StdMeshers/StdMeshers_AutomaticLength.cxx @@ -84,7 +84,6 @@ const double theCoarseConst = 0.5; const double theFineConst = 4.5; void StdMeshers_AutomaticLength::SetFineness(double theFineness) - throw(SALOME_Exception) { if ( theFineness < 0.0 || theFineness > 1.0 ) throw SALOME_Exception(LOCALIZED("theFineness is out of range [0.0-1.0]")); @@ -239,7 +238,6 @@ namespace { double StdMeshers_AutomaticLength::GetLength(const SMESH_Mesh* theMesh, const double theEdgeLength) - throw(SALOME_Exception) { if ( !theMesh ) throw SALOME_Exception(LOCALIZED("NULL Mesh")); @@ -261,7 +259,6 @@ double StdMeshers_AutomaticLength::GetLength(const SMESH_Mesh* theMesh, double StdMeshers_AutomaticLength::GetLength(const SMESH_Mesh* theMesh, const TopoDS_Shape& anEdge) - throw(SALOME_Exception) { if ( !theMesh ) throw SALOME_Exception(LOCALIZED("NULL Mesh")); diff --git a/src/StdMeshers/StdMeshers_AutomaticLength.hxx b/src/StdMeshers/StdMeshers_AutomaticLength.hxx index b02e0e724..6aec22d49 100644 --- a/src/StdMeshers/StdMeshers_AutomaticLength.hxx +++ b/src/StdMeshers/StdMeshers_AutomaticLength.hxx @@ -55,14 +55,12 @@ public: /*! * \brief Computes segment for a given edge */ - double GetLength(const SMESH_Mesh* aMesh, const TopoDS_Shape& anEdge) - throw(SALOME_Exception); + double GetLength(const SMESH_Mesh* aMesh, const TopoDS_Shape& anEdge); /*! * \brief Computes segment length for an edge of given length */ - double GetLength(const SMESH_Mesh* aMesh, const double edgeLength) - throw(SALOME_Exception); + double GetLength(const SMESH_Mesh* aMesh, const double edgeLength); /*! * \brief Set Fineness @@ -74,8 +72,7 @@ public: * The "Initial Number of Elements on the Shortest Edge" (S0) * is divided by (0.5 + 4.5 x theFineness) */ - void SetFineness(double theFineness) - throw(SALOME_Exception); + void SetFineness(double theFineness); /*! * \brief Return mesh Fineness diff --git a/src/StdMeshers/StdMeshers_CartesianParameters3D.cxx b/src/StdMeshers/StdMeshers_CartesianParameters3D.cxx index 5717f0a2c..6b3e24ed4 100644 --- a/src/StdMeshers/StdMeshers_CartesianParameters3D.cxx +++ b/src/StdMeshers/StdMeshers_CartesianParameters3D.cxx @@ -133,7 +133,6 @@ namespace void checkGridSpacing(std::vector& spaceFunctions, std::vector& internalPoints, const std::string& axis) - throw ( SALOME_Exception ) { if ( spaceFunctions.empty() ) throw SALOME_Exception(SMESH_Comment("Empty space function for ") << axis ); @@ -170,7 +169,6 @@ namespace //======================================================================= void StdMeshers_CartesianParameters3D::SetGrid(std::vector& coords, int axis) - throw ( SALOME_Exception ) { checkAxis( axis ); @@ -198,7 +196,6 @@ void StdMeshers_CartesianParameters3D::SetGrid(std::vector& coords, int void StdMeshers_CartesianParameters3D::SetGridSpacing(std::vector& xSpaceFuns, std::vector& xInternalPoints, const int axis) - throw ( SALOME_Exception ) { checkAxis( axis ); @@ -252,7 +249,6 @@ bool StdMeshers_CartesianParameters3D::GetFixedPoint(double p[3]) const //======================================================================= void StdMeshers_CartesianParameters3D::SetSizeThreshold(const double threshold) - throw ( SALOME_Exception ) { if ( threshold <= 1.0 ) throw SALOME_Exception(LOCALIZED("threshold must be > 1.0")); @@ -272,7 +268,6 @@ void StdMeshers_CartesianParameters3D::SetSizeThreshold(const double threshold) void StdMeshers_CartesianParameters3D::GetGridSpacing(std::vector& spaceFunctions, std::vector& internalPoints, const int axis) const - throw ( SALOME_Exception ) { if ( !IsGridBySpacing(axis) ) throw SALOME_Exception(LOCALIZED("The grid is defined by coordinates and not by spacing")); @@ -286,7 +281,6 @@ void StdMeshers_CartesianParameters3D::GetGridSpacing(std::vector& //======================================================================= bool StdMeshers_CartesianParameters3D::IsGridBySpacing(const int axis) const - throw ( SALOME_Exception ) { checkAxis(axis); return !_spaceFunctions[axis].empty(); @@ -305,7 +299,6 @@ void StdMeshers_CartesianParameters3D::ComputeCoordinates(const double x0, vector& coords, const string& axis, const double* xForced ) - throw ( SALOME_Exception ) { checkGridSpacing( theSpaceFuns, thePoints, axis ); @@ -404,7 +397,6 @@ void StdMeshers_CartesianParameters3D::GetCoordinates(std::vector& xNode std::vector& yNodes, std::vector& zNodes, const Bnd_Box& bndBox) const - throw ( SALOME_Exception ) { double x0,y0,z0, x1,y1,z1; if ( IsGridBySpacing(0) || IsGridBySpacing(1) || IsGridBySpacing(2)) @@ -655,7 +647,6 @@ ComputeOptimalAxesDirs(const TopoDS_Shape& shape, //======================================================================= void StdMeshers_CartesianParameters3D::SetAxisDirs(const double* the9DirComps) - throw ( SALOME_Exception ) { gp_Vec x( the9DirComps[0], the9DirComps[1], @@ -697,7 +688,6 @@ void StdMeshers_CartesianParameters3D::SetAxisDirs(const double* the9DirComps) //======================================================================= void StdMeshers_CartesianParameters3D::GetGrid(std::vector& coords, int axis) const - throw ( SALOME_Exception ) { if ( IsGridBySpacing(axis) ) throw SALOME_Exception(LOCALIZED("The grid is defined by spacing and not by coordinates")); diff --git a/src/StdMeshers/StdMeshers_CartesianParameters3D.hxx b/src/StdMeshers/StdMeshers_CartesianParameters3D.hxx index 9c3217afa..466d95984 100644 --- a/src/StdMeshers/StdMeshers_CartesianParameters3D.hxx +++ b/src/StdMeshers/StdMeshers_CartesianParameters3D.hxx @@ -54,11 +54,11 @@ public: /*! * Sets coordinates of node positions along an axis (countered from 0) */ - void SetGrid(std::vector& xNodes, int axis) throw ( SALOME_Exception ); + void SetGrid(std::vector& xNodes, int axis); /*! * Return coordinates of node positions along the three axes */ - void GetGrid(std::vector& xNodes, int axis) const throw ( SALOME_Exception ); + void GetGrid(std::vector& xNodes, int axis) const; /*! * \brief Set grid spacing along the three axes @@ -70,13 +70,13 @@ public: */ void SetGridSpacing(std::vector& spaceFunctions, std::vector& internalPoints, - const int axis) throw ( SALOME_Exception ); + const int axis); void GetGridSpacing(std::vector& spaceFunctions, std::vector& internalPoints, - const int axis) const throw ( SALOME_Exception ); + const int axis) const; - bool IsGridBySpacing(const int axis) const throw ( SALOME_Exception ); + bool IsGridBySpacing(const int axis) const; /*! * Set/unset a fixed point, at which a node will be created provided that grid @@ -99,7 +99,7 @@ public: std::vector& points, std::vector& coords, const std::string& axis, - const double* xForced=0) throw (SALOME_Exception); + const double* xForced=0); /*! * Return coordinates of node positions along the three axes. * If the grid is defined by spacing functions, the coordinates are computed @@ -107,12 +107,12 @@ public: void GetCoordinates(std::vector& xNodes, std::vector& yNodes, std::vector& zNodes, - const Bnd_Box& bndBox) const throw ( SALOME_Exception ); + const Bnd_Box& bndBox) const; /*! * \brief Set custom direction of axes */ - void SetAxisDirs(const double* the9DirComps) throw ( SALOME_Exception ); + void SetAxisDirs(const double* the9DirComps); const double* GetAxisDirs() const { return _axisDirs; } /*! * \brief Returns axes at which number of hexahedra is maximal @@ -125,7 +125,7 @@ public: * hexahedron by geometry boundary is considered small and is removed if * it's size is \athreshold times less than the size of the initial hexahedron. */ - void SetSizeThreshold(const double threshold) throw ( SALOME_Exception ); + void SetSizeThreshold(const double threshold); /*! * \brief Return size threshold */ diff --git a/src/StdMeshers/StdMeshers_Cartesian_3D.cxx b/src/StdMeshers/StdMeshers_Cartesian_3D.cxx index 6f284e4ba..06cf5ba05 100644 --- a/src/StdMeshers/StdMeshers_Cartesian_3D.cxx +++ b/src/StdMeshers/StdMeshers_Cartesian_3D.cxx @@ -191,10 +191,10 @@ namespace bool _hasInternalFaces; public: virtual ~Solid() {} - virtual bool Contains( TGeomID subID ) const { return true; } - virtual bool ContainsAny( const vector< TGeomID>& subIDs ) const { return true; } + virtual bool Contains( TGeomID /*subID*/ ) const { return true; } + virtual bool ContainsAny( const vector< TGeomID>& /*subIDs*/ ) const { return true; } virtual TopAbs_Orientation Orientation( const TopoDS_Shape& s ) const { return s.Orientation(); } - virtual bool IsOutsideOriented( TGeomID faceID ) const { return true; } + virtual bool IsOutsideOriented( TGeomID /*faceID*/ ) const { return true; } void SetID( TGeomID id ) { _id = id; } TGeomID ID() const { return _id; } void SetHasInternalFaces( bool has ) { _hasInternalFaces = has; } @@ -2219,6 +2219,8 @@ namespace } #ifdef _DEBUG_ _cellID = cellID; +#else + (void)cellID; // unused in release mode #endif } @@ -2561,7 +2563,7 @@ namespace case 3: // at a corner { _Node& node = _hexNodes[ subEntity - SMESH_Block::ID_FirstV ]; - if ( node.Node() > 0 ) + if ( node.Node() != 0 ) { if ( node._intPoint ) node._intPoint->Add( _eIntPoints[ iP ]->_faceIDs, _eIntPoints[ iP ]->_node ); @@ -3501,7 +3503,7 @@ namespace continue; // perform intersection - E_IntersectPoint* eip, *vip; + E_IntersectPoint* eip, *vip = 0; // todo: vip must be explicitly initialized to avoid warning (see below) for ( int iDirZ = 0; iDirZ < 3; ++iDirZ ) { GridPlanes& planes = pln[ iDirZ ]; @@ -3602,7 +3604,7 @@ namespace vip = _grid->Add( ip ); if ( isInternal && !sameV ) vip->_faceIDs.push_back( _grid->PseudoIntExtFaceID() ); - if ( !addIntersection( vip, hexes, ijk, d000 ) && !sameV ) + if ( !addIntersection( vip, hexes, ijk, d000 ) && !sameV ) // todo: vip must be explicitly initialized to avoid warning (see above) _grid->Remove( vip ); ip._shapeID = edgeID; } @@ -4759,6 +4761,8 @@ namespace cout << "BUG: not shared link. IKJ = ( "<< _i << " " << _j << " " << _k << " )" << endl << "n1 (" << p1.X() << ", "<< p1.Y() << ", "<< p1.Z() << " )" << endl << "n2 (" << p2.X() << ", "<< p2.Y() << ", "<< p2.Z() << " )" << endl; +#else + (void)link; // unused in release mode #endif return false; } @@ -5409,7 +5413,7 @@ namespace if ( allQuads ) { // set side nodes as this: bottom, top, top, ... - int iTop, iBot; // side indices + int iTop = 0, iBot = 0; // side indices for ( int iS = 0; iS < 6; ++iS ) { if ( vol->_names[ iS ] == SMESH_Block::ID_Fxy0 ) @@ -5908,9 +5912,9 @@ bool StdMeshers_Cartesian_3D::Compute(SMESH_Mesh & theMesh, */ //============================================================================= -bool StdMeshers_Cartesian_3D::Evaluate(SMESH_Mesh & theMesh, - const TopoDS_Shape & theShape, - MapShapeNbElems& theResMap) +bool StdMeshers_Cartesian_3D::Evaluate(SMESH_Mesh & /*theMesh*/, + const TopoDS_Shape & /*theShape*/, + MapShapeNbElems& /*theResMap*/) { // TODO // std::vector aResVec(SMDSEntity_Last); @@ -5964,11 +5968,11 @@ namespace // -------------------------------------------------------------------------------- // unsetting _alwaysComputed flag if "Cartesian_3D" was removed // - virtual void ProcessEvent(const int event, + virtual void ProcessEvent(const int /*event*/, const int eventType, SMESH_subMesh* subMeshOfSolid, - SMESH_subMeshEventListenerData* data, - const SMESH_Hypothesis* hyp = 0) + SMESH_subMeshEventListenerData* /*data*/, + const SMESH_Hypothesis* /*hyp*/ = 0) { if ( eventType == SMESH_subMesh::COMPUTE_EVENT ) { diff --git a/src/StdMeshers/StdMeshers_Cartesian_3D.hxx b/src/StdMeshers/StdMeshers_Cartesian_3D.hxx index 18797e278..611170c80 100644 --- a/src/StdMeshers/StdMeshers_Cartesian_3D.hxx +++ b/src/StdMeshers/StdMeshers_Cartesian_3D.hxx @@ -51,8 +51,8 @@ public: virtual bool Compute(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape); - virtual bool Evaluate(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, - MapShapeNbElems& aResMap); + virtual bool Evaluate(SMESH_Mesh & /*aMesh*/, const TopoDS_Shape & /*aShape*/, + MapShapeNbElems& /*aResMap*/); virtual void SetEventListener(SMESH_subMesh* subMesh); diff --git a/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx b/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx index b3e420619..3a1ac59c6 100644 --- a/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx +++ b/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx @@ -289,8 +289,8 @@ StdMeshers_CompositeHexa_3D::StdMeshers_CompositeHexa_3D(int hypId, SMESH_Gen* g */ //================================================================================ -bool StdMeshers_CompositeHexa_3D::CheckHypothesis(SMESH_Mesh& aMesh, - const TopoDS_Shape& aShape, +bool StdMeshers_CompositeHexa_3D::CheckHypothesis(SMESH_Mesh& /*aMesh*/, + const TopoDS_Shape& /*aShape*/, Hypothesis_Status& aStatus) { _blockRenumberHyp = nullptr; @@ -1480,7 +1480,7 @@ bool _QuadFaceGrid::LoadGrid( SMESH_ProxyMesh& mesh ) if ( fIt->next()->NbNodes() % 4 > 0 ) return error("Non-quadrangular mesh faces are not allowed on sides of a composite block"); - bool isProxy, isTmpElem; + bool isProxy = false, isTmpElem = false; if ( faceSubMesh && faceSubMesh->NbElements() > 0 ) { isProxy = dynamic_cast< const SMESH_ProxyMesh::SubMesh* >( faceSubMesh ); @@ -1896,7 +1896,7 @@ bool _QuadFaceGrid::GetNormal( const TopoDS_Vertex& v, gp_Vec& n ) const n = d1u.Crossed( d1v ); return true; } - catch (Standard_Failure) { + catch (Standard_Failure&) { return false; } } diff --git a/src/StdMeshers/StdMeshers_CompositeHexa_3D.hxx b/src/StdMeshers/StdMeshers_CompositeHexa_3D.hxx index 9a17e2b81..0d8c0a443 100644 --- a/src/StdMeshers/StdMeshers_CompositeHexa_3D.hxx +++ b/src/StdMeshers/StdMeshers_CompositeHexa_3D.hxx @@ -54,8 +54,8 @@ public: virtual bool Evaluate(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, MapShapeNbElems& aResMap); - virtual bool CheckHypothesis(SMESH_Mesh& aMesh, - const TopoDS_Shape& aShape, + virtual bool CheckHypothesis(SMESH_Mesh& /*aMesh*/, + const TopoDS_Shape& /*aShape*/, Hypothesis_Status& aStatus); private: diff --git a/src/StdMeshers/StdMeshers_Deflection1D.cxx b/src/StdMeshers/StdMeshers_Deflection1D.cxx index 1135fe668..bbf47cb21 100644 --- a/src/StdMeshers/StdMeshers_Deflection1D.cxx +++ b/src/StdMeshers/StdMeshers_Deflection1D.cxx @@ -75,7 +75,6 @@ StdMeshers_Deflection1D::~StdMeshers_Deflection1D() //============================================================================= void StdMeshers_Deflection1D::SetDeflection(double value) - throw(SALOME_Exception) { if (_value != value) { if (value <= 0.) diff --git a/src/StdMeshers/StdMeshers_Deflection1D.hxx b/src/StdMeshers/StdMeshers_Deflection1D.hxx index 39bbab328..2497a4e70 100644 --- a/src/StdMeshers/StdMeshers_Deflection1D.hxx +++ b/src/StdMeshers/StdMeshers_Deflection1D.hxx @@ -38,7 +38,7 @@ class STDMESHERS_EXPORT StdMeshers_Deflection1D:public SMESH_Hypothesis StdMeshers_Deflection1D(int hypId, SMESH_Gen * gen); virtual ~ StdMeshers_Deflection1D(); - void SetDeflection(double value) throw(SALOME_Exception); + void SetDeflection(double value); double GetDeflection() const; diff --git a/src/StdMeshers/StdMeshers_Distribution.cxx b/src/StdMeshers/StdMeshers_Distribution.cxx index c8321c1a0..51907cd9d 100644 --- a/src/StdMeshers/StdMeshers_Distribution.cxx +++ b/src/StdMeshers/StdMeshers_Distribution.cxx @@ -55,7 +55,7 @@ bool Function::value( const double, double& f ) const try { OCC_CATCH_SIGNALS; f = pow( 10., f ); - } catch(Standard_Failure) { + } catch(Standard_Failure&) { f = 0.0; ok = false; } @@ -185,7 +185,7 @@ FunctionExpr::FunctionExpr( const char* str, const int conv ) OCC_CATCH_SIGNALS; myExpr = ExprIntrp_GenExp::Create(); myExpr->Process( ( Standard_CString )str ); - } catch(Standard_Failure) { + } catch(Standard_Failure&) { ok = false; } @@ -217,7 +217,7 @@ bool FunctionExpr::value( const double t, double& f ) const try { OCC_CATCH_SIGNALS; f = myExpr->Expression()->Evaluate( myVars, myValues ); - } catch(Standard_Failure) { + } catch(Standard_Failure&) { f = 0.0; ok = false; } @@ -235,7 +235,7 @@ double FunctionExpr::integral( const double a, const double b ) const ( *static_cast( const_cast (this) ), a, b, 20 ); if( _int.IsDone() ) res = _int.Value(); - } catch(Standard_Failure) { + } catch(Standard_Failure&) { res = 0.0; MESSAGE( "Exception in integral calculating" ); } diff --git a/src/StdMeshers/StdMeshers_FaceSide.cxx b/src/StdMeshers/StdMeshers_FaceSide.cxx index a9c254e09..0ebea3740 100644 --- a/src/StdMeshers/StdMeshers_FaceSide.cxx +++ b/src/StdMeshers/StdMeshers_FaceSide.cxx @@ -1176,6 +1176,8 @@ void StdMeshers_FaceSide::dump(const char* msg) const MESSAGE_ADD ( "\tF: "<& listParams) - throw(SALOME_Exception) { _params = listParams; NotifySubMeshesHypothesisModification(); @@ -74,7 +73,6 @@ void StdMeshers_FixedPoints1D::SetPoints(const std::vector& listParams) //============================================================================= void StdMeshers_FixedPoints1D::SetNbSegments(const std::vector& listNbSeg) - throw(SALOME_Exception) { _nbsegs = listNbSeg; NotifySubMeshesHypothesisModification(); @@ -180,7 +178,7 @@ bool StdMeshers_FixedPoints1D::SetParametersByMesh(const SMESH_Mesh* theMesh, */ //================================================================================ -bool StdMeshers_FixedPoints1D::SetParametersByDefaults(const TDefaults& dflts, +bool StdMeshers_FixedPoints1D::SetParametersByDefaults(const TDefaults& /*dflts*/, const SMESH_Mesh* /*mesh*/) { _nbsegs.reserve( 1 ); diff --git a/src/StdMeshers/StdMeshers_FixedPoints1D.hxx b/src/StdMeshers/StdMeshers_FixedPoints1D.hxx index 95bf09ed5..431ef1e9e 100644 --- a/src/StdMeshers/StdMeshers_FixedPoints1D.hxx +++ b/src/StdMeshers/StdMeshers_FixedPoints1D.hxx @@ -41,11 +41,9 @@ public: StdMeshers_FixedPoints1D(int hypId, SMESH_Gen* gen); virtual ~StdMeshers_FixedPoints1D(); - void SetPoints(const std::vector& listParams) - throw(SALOME_Exception); + void SetPoints(const std::vector& listParams); - void SetNbSegments(const std::vector& listNbSeg) - throw(SALOME_Exception); + void SetNbSegments(const std::vector& listNbSeg) ; const std::vector& GetPoints() const { return _params; } diff --git a/src/StdMeshers/StdMeshers_Geometric1D.cxx b/src/StdMeshers/StdMeshers_Geometric1D.cxx index 8ac037d92..25dd996ed 100644 --- a/src/StdMeshers/StdMeshers_Geometric1D.cxx +++ b/src/StdMeshers/StdMeshers_Geometric1D.cxx @@ -57,7 +57,6 @@ StdMeshers_Geometric1D::StdMeshers_Geometric1D(int hypId, SMESH_Gen * gen) //============================================================================= void StdMeshers_Geometric1D::SetStartLength(double length) - throw(SALOME_Exception) { if ( _begLength != length ) { @@ -75,7 +74,6 @@ void StdMeshers_Geometric1D::SetStartLength(double length) //============================================================================= void StdMeshers_Geometric1D::SetCommonRatio(double factor) - throw(SALOME_Exception) { if ( _ratio != factor ) { diff --git a/src/StdMeshers/StdMeshers_Geometric1D.hxx b/src/StdMeshers/StdMeshers_Geometric1D.hxx index 86018a21f..1e3d86ac1 100644 --- a/src/StdMeshers/StdMeshers_Geometric1D.hxx +++ b/src/StdMeshers/StdMeshers_Geometric1D.hxx @@ -37,8 +37,8 @@ class STDMESHERS_EXPORT StdMeshers_Geometric1D: public StdMeshers_Reversible1D public: StdMeshers_Geometric1D(int hypId, SMESH_Gen* gen); - void SetStartLength(double length) throw(SALOME_Exception); - void SetCommonRatio(double factor) throw(SALOME_Exception); + void SetStartLength(double length); + void SetCommonRatio(double factor); double GetStartLength() const; double GetCommonRatio() const; diff --git a/src/StdMeshers/StdMeshers_Hexa_3D.cxx b/src/StdMeshers/StdMeshers_Hexa_3D.cxx index eeb6ad40e..4f2cacc70 100644 --- a/src/StdMeshers/StdMeshers_Hexa_3D.cxx +++ b/src/StdMeshers/StdMeshers_Hexa_3D.cxx @@ -1127,7 +1127,7 @@ bool StdMeshers_Hexa_3D::IsApplicable( const TopoDS_Shape & aShape, bool toCheck if ( !toCheckAll && ok ) return true; } return toCheckAll; -}; +} //======================================================================= //function : ComputePentahedralMesh diff --git a/src/StdMeshers/StdMeshers_Import_1D.cxx b/src/StdMeshers/StdMeshers_Import_1D.cxx index af0ea24bd..32582cc5d 100644 --- a/src/StdMeshers/StdMeshers_Import_1D.cxx +++ b/src/StdMeshers/StdMeshers_Import_1D.cxx @@ -434,6 +434,7 @@ namespace // INTERNAL STUFF case TopAbs_EDGE: if ( SMESH_Algo::isDegenerated( TopoDS::Edge( sm->GetSubShape() ))) continue; + // fall through case TopAbs_FACE: _subM.insert( sm ); if ( !sm->IsEmpty() ) diff --git a/src/StdMeshers/StdMeshers_LayerDistribution.cxx b/src/StdMeshers/StdMeshers_LayerDistribution.cxx index 8212547e9..8758b0fcb 100644 --- a/src/StdMeshers/StdMeshers_LayerDistribution.cxx +++ b/src/StdMeshers/StdMeshers_LayerDistribution.cxx @@ -69,7 +69,6 @@ StdMeshers_LayerDistribution::~StdMeshers_LayerDistribution() //============================================================================= void StdMeshers_LayerDistribution::SetLayerDistribution(SMESH_Hypothesis* hyp1D) - throw ( SALOME_Exception ) { if ( myHyp != hyp1D ) { if ( myHyp && hyp1D->GetDim() != 1 ) diff --git a/src/StdMeshers/StdMeshers_LayerDistribution.hxx b/src/StdMeshers/StdMeshers_LayerDistribution.hxx index fa12e2c1d..1a51e9919 100644 --- a/src/StdMeshers/StdMeshers_LayerDistribution.hxx +++ b/src/StdMeshers/StdMeshers_LayerDistribution.hxx @@ -59,8 +59,7 @@ public: * \brief Sets 1D hypothesis specifying distribution of layers * \param hyp1D - 1D hypothesis */ - void SetLayerDistribution(SMESH_Hypothesis* hyp1D) - throw ( SALOME_Exception ); + void SetLayerDistribution(SMESH_Hypothesis* hyp1D); /*! * \brief Returns 1D hypothesis specifying distribution of layers diff --git a/src/StdMeshers/StdMeshers_LengthFromEdges.cxx b/src/StdMeshers/StdMeshers_LengthFromEdges.cxx index f935dbb32..5399982a3 100644 --- a/src/StdMeshers/StdMeshers_LengthFromEdges.cxx +++ b/src/StdMeshers/StdMeshers_LengthFromEdges.cxx @@ -63,7 +63,6 @@ StdMeshers_LengthFromEdges::~StdMeshers_LengthFromEdges() //============================================================================= void StdMeshers_LengthFromEdges::SetMode(int mode) - throw (SALOME_Exception) { int oldMode = _mode; if (mode <= 0) diff --git a/src/StdMeshers/StdMeshers_LengthFromEdges.hxx b/src/StdMeshers/StdMeshers_LengthFromEdges.hxx index b172cf8c8..0e11d1aa1 100644 --- a/src/StdMeshers/StdMeshers_LengthFromEdges.hxx +++ b/src/StdMeshers/StdMeshers_LengthFromEdges.hxx @@ -41,8 +41,7 @@ public: StdMeshers_LengthFromEdges(int hypId, SMESH_Gen* gen); virtual ~StdMeshers_LengthFromEdges(); - void SetMode(int mode) - throw (SALOME_Exception); + void SetMode(int mode); int GetMode(); diff --git a/src/StdMeshers/StdMeshers_LocalLength.cxx b/src/StdMeshers/StdMeshers_LocalLength.cxx index 2ff1609ce..70b04d108 100644 --- a/src/StdMeshers/StdMeshers_LocalLength.cxx +++ b/src/StdMeshers/StdMeshers_LocalLength.cxx @@ -77,7 +77,7 @@ StdMeshers_LocalLength::~StdMeshers_LocalLength() */ //============================================================================= -void StdMeshers_LocalLength::SetLength(double length) throw(SALOME_Exception) +void StdMeshers_LocalLength::SetLength(double length) { double oldLength = _length; if (length <= 0) @@ -104,7 +104,7 @@ double StdMeshers_LocalLength::GetLength() const * */ //============================================================================= -void StdMeshers_LocalLength::SetPrecision (double thePrecision) throw(SALOME_Exception) +void StdMeshers_LocalLength::SetPrecision (double thePrecision) { double oldPrecision = _precision; if (_precision < 0) diff --git a/src/StdMeshers/StdMeshers_LocalLength.hxx b/src/StdMeshers/StdMeshers_LocalLength.hxx index 50da6ecc8..55140e47c 100644 --- a/src/StdMeshers/StdMeshers_LocalLength.hxx +++ b/src/StdMeshers/StdMeshers_LocalLength.hxx @@ -40,8 +40,8 @@ class STDMESHERS_EXPORT StdMeshers_LocalLength: public SMESH_Hypothesis StdMeshers_LocalLength(int hypId, SMESH_Gen * gen); virtual ~ StdMeshers_LocalLength(); - void SetLength(double length) throw(SALOME_Exception); - void SetPrecision(double precision) throw(SALOME_Exception); + void SetLength(double length); + void SetPrecision(double precision); double GetLength() const; double GetPrecision() const; diff --git a/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx b/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx index 300ef4d43..0e0c0beea 100644 --- a/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx +++ b/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx @@ -677,7 +677,7 @@ bool StdMeshers_MEFISTO_2D::LoadPoints(TWireVector & wires, */ //============================================================================= -void StdMeshers_MEFISTO_2D::ComputeScaleOnFace(SMESH_Mesh & aMesh, +void StdMeshers_MEFISTO_2D::ComputeScaleOnFace(SMESH_Mesh & /*aMesh*/, const TopoDS_Face & aFace, double & scalex, double & scaley) diff --git a/src/StdMeshers/StdMeshers_MaxElementArea.cxx b/src/StdMeshers/StdMeshers_MaxElementArea.cxx index e84ad579e..286b6198c 100644 --- a/src/StdMeshers/StdMeshers_MaxElementArea.cxx +++ b/src/StdMeshers/StdMeshers_MaxElementArea.cxx @@ -73,7 +73,6 @@ StdMeshers_MaxElementArea::~StdMeshers_MaxElementArea() //============================================================================= void StdMeshers_MaxElementArea::SetMaxArea(double maxArea) - throw (SALOME_Exception) { double oldArea = _maxArea; if (maxArea <= 0) diff --git a/src/StdMeshers/StdMeshers_MaxElementArea.hxx b/src/StdMeshers/StdMeshers_MaxElementArea.hxx index 31eb96b6e..8f952e890 100644 --- a/src/StdMeshers/StdMeshers_MaxElementArea.hxx +++ b/src/StdMeshers/StdMeshers_MaxElementArea.hxx @@ -40,7 +40,7 @@ public: StdMeshers_MaxElementArea(int hypId, SMESH_Gen * gen); virtual ~ StdMeshers_MaxElementArea(); - void SetMaxArea(double maxArea) throw(SALOME_Exception); + void SetMaxArea(double maxArea); double GetMaxArea() const; diff --git a/src/StdMeshers/StdMeshers_MaxElementVolume.cxx b/src/StdMeshers/StdMeshers_MaxElementVolume.cxx index bc520d476..d20454d63 100644 --- a/src/StdMeshers/StdMeshers_MaxElementVolume.cxx +++ b/src/StdMeshers/StdMeshers_MaxElementVolume.cxx @@ -73,7 +73,6 @@ StdMeshers_MaxElementVolume::~StdMeshers_MaxElementVolume() //============================================================================= void StdMeshers_MaxElementVolume::SetMaxVolume(double maxVolume) - throw (SALOME_Exception) { double oldVolume = _maxVolume; if (maxVolume <= 0) diff --git a/src/StdMeshers/StdMeshers_MaxElementVolume.hxx b/src/StdMeshers/StdMeshers_MaxElementVolume.hxx index 648e792da..70dd30c87 100644 --- a/src/StdMeshers/StdMeshers_MaxElementVolume.hxx +++ b/src/StdMeshers/StdMeshers_MaxElementVolume.hxx @@ -41,8 +41,7 @@ public: StdMeshers_MaxElementVolume(int hypId, SMESH_Gen* gen); virtual ~StdMeshers_MaxElementVolume(); - void SetMaxVolume(double maxVolume) - throw (SALOME_Exception); + void SetMaxVolume(double maxVolume); double GetMaxVolume() const; diff --git a/src/StdMeshers/StdMeshers_MaxLength.cxx b/src/StdMeshers/StdMeshers_MaxLength.cxx index 2307c396c..637f7dc0b 100644 --- a/src/StdMeshers/StdMeshers_MaxLength.cxx +++ b/src/StdMeshers/StdMeshers_MaxLength.cxx @@ -73,7 +73,7 @@ StdMeshers_MaxLength::~StdMeshers_MaxLength() */ //============================================================================= -void StdMeshers_MaxLength::SetLength(double length) throw(SALOME_Exception) +void StdMeshers_MaxLength::SetLength(double length) { if (length <= 0) throw SALOME_Exception(LOCALIZED("length must be positive")); diff --git a/src/StdMeshers/StdMeshers_MaxLength.hxx b/src/StdMeshers/StdMeshers_MaxLength.hxx index 273231394..ba345adaf 100644 --- a/src/StdMeshers/StdMeshers_MaxLength.hxx +++ b/src/StdMeshers/StdMeshers_MaxLength.hxx @@ -35,7 +35,7 @@ class STDMESHERS_EXPORT StdMeshers_MaxLength: public SMESH_Hypothesis StdMeshers_MaxLength(int hypId, SMESH_Gen * gen); virtual ~ StdMeshers_MaxLength(); - void SetLength(double length) throw(SALOME_Exception); + void SetLength(double length); double GetLength() const; bool HavePreestimatedLength() const { return _preestimated > 0.; } diff --git a/src/StdMeshers/StdMeshers_NotConformAllowed.cxx b/src/StdMeshers/StdMeshers_NotConformAllowed.cxx index ab14a3cbe..0de1cd9e6 100644 --- a/src/StdMeshers/StdMeshers_NotConformAllowed.cxx +++ b/src/StdMeshers/StdMeshers_NotConformAllowed.cxx @@ -81,7 +81,7 @@ istream & StdMeshers_NotConformAllowed::LoadFrom(istream & load) */ //============================================================================= -ostream & operator << (ostream & save, StdMeshers_NotConformAllowed & hyp) +ostream & operator << (ostream & save, StdMeshers_NotConformAllowed & /*hyp*/) { return save; } @@ -92,7 +92,7 @@ ostream & operator << (ostream & save, StdMeshers_NotConformAllowed & hyp) */ //============================================================================= -istream & operator >> (istream & load, StdMeshers_NotConformAllowed & hyp) +istream & operator >> (istream & load, StdMeshers_NotConformAllowed & /*hyp*/) { return load; } diff --git a/src/StdMeshers/StdMeshers_NumberOfLayers.cxx b/src/StdMeshers/StdMeshers_NumberOfLayers.cxx index 289239c9c..67aac1d24 100644 --- a/src/StdMeshers/StdMeshers_NumberOfLayers.cxx +++ b/src/StdMeshers/StdMeshers_NumberOfLayers.cxx @@ -72,7 +72,6 @@ StdMeshers_NumberOfLayers::~StdMeshers_NumberOfLayers() //============================================================================= void StdMeshers_NumberOfLayers::SetNumberOfLayers(int numberOfLayers) - throw ( SALOME_Exception ) { if ( _nbLayers != numberOfLayers ) { if ( numberOfLayers <= 0 ) diff --git a/src/StdMeshers/StdMeshers_NumberOfLayers.hxx b/src/StdMeshers/StdMeshers_NumberOfLayers.hxx index d76e77a8e..5b26622bc 100644 --- a/src/StdMeshers/StdMeshers_NumberOfLayers.hxx +++ b/src/StdMeshers/StdMeshers_NumberOfLayers.hxx @@ -54,7 +54,7 @@ public: virtual ~StdMeshers_NumberOfLayers(); // Sets parameter value - void SetNumberOfLayers(int numberOfLayers) throw ( SALOME_Exception ); + void SetNumberOfLayers(int numberOfLayers); // Returns parameter value int GetNumberOfLayers() const; diff --git a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx index ac0aef05d..08f1210b9 100644 --- a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx +++ b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx @@ -87,7 +87,6 @@ StdMeshers_NumberOfSegments::~StdMeshers_NumberOfSegments() //============================================================================= const vector& StdMeshers_NumberOfSegments::BuildDistributionExpr( const char* expr,int nbSeg,int conv ) - throw ( SALOME_Exception ) { if( !buildDistribution( TCollection_AsciiString( ( Standard_CString )expr ), conv, 0.0, 1.0, nbSeg, _distr, 1E-4 ) ) _distr.resize( 0 ); @@ -98,7 +97,6 @@ const vector& StdMeshers_NumberOfSegments::BuildDistributionTab( const vector& tab, int nbSeg, int conv ) - throw ( SALOME_Exception ) { if( !buildDistribution( tab, conv, 0.0, 1.0, nbSeg, _distr, 1E-4 ) ) _distr.resize( 0 ); @@ -112,7 +110,6 @@ StdMeshers_NumberOfSegments::BuildDistributionTab( const vector& tab, //============================================================================= void StdMeshers_NumberOfSegments::SetNumberOfSegments(int segmentsNumber) -throw(SALOME_Exception) { int oldNumberOfSegments = _numberOfSegments; if (segmentsNumber <= 0) @@ -141,7 +138,6 @@ int StdMeshers_NumberOfSegments::GetNumberOfSegments() const //================================================================================ void StdMeshers_NumberOfSegments::SetDistrType(DistrType typ) - throw(SALOME_Exception) { if (typ < DT_Regular || typ > DT_ExprFunc) throw SALOME_Exception(LOCALIZED("distribution type is out of range")); @@ -171,7 +167,6 @@ StdMeshers_NumberOfSegments::DistrType StdMeshers_NumberOfSegments::GetDistrType //================================================================================ void StdMeshers_NumberOfSegments::SetScaleFactor(double scaleFactor) - throw(SALOME_Exception) { if (scaleFactor < PRECISION) throw SALOME_Exception(LOCALIZED("scale factor must be positive")); @@ -197,7 +192,6 @@ void StdMeshers_NumberOfSegments::SetScaleFactor(double scaleFactor) //================================================================================ double StdMeshers_NumberOfSegments::GetScaleFactor() const - throw(SALOME_Exception) { if (_distrType != DT_Scale) throw SALOME_Exception(LOCALIZED("not a scale distribution")); @@ -211,7 +205,6 @@ double StdMeshers_NumberOfSegments::GetScaleFactor() const //================================================================================ void StdMeshers_NumberOfSegments::SetTableFunction(const vector& table) - throw(SALOME_Exception) { if (_distrType != DT_TabFunc) _distrType = DT_TabFunc; @@ -233,7 +226,7 @@ void StdMeshers_NumberOfSegments::SetTableFunction(const vector& table) OCC_CATCH_SIGNALS; val = pow( 10.0, val ); } - catch(Standard_Failure) { + catch(Standard_Failure&) { throw SALOME_Exception( LOCALIZED( "invalid value")); return; } @@ -276,7 +269,6 @@ void StdMeshers_NumberOfSegments::SetTableFunction(const vector& table) //================================================================================ const vector& StdMeshers_NumberOfSegments::GetTableFunction() const - throw(SALOME_Exception) { if (_distrType != DT_TabFunc) throw SALOME_Exception(LOCALIZED("not a table function distribution")); @@ -327,7 +319,7 @@ bool process( const TCollection_AsciiString& str, int convMode, OCC_CATCH_SIGNALS; myExpr = ExprIntrp_GenExp::Create(); myExpr->Process( str.ToCString() ); - } catch(Standard_Failure) { + } catch(Standard_Failure&) { parsed_ok = false; } @@ -380,7 +372,6 @@ bool process( const TCollection_AsciiString& str, int convMode, //================================================================================ void StdMeshers_NumberOfSegments::SetExpressionFunction(const char* expr) - throw(SALOME_Exception) { if (_distrType != DT_ExprFunc) _distrType = DT_ExprFunc; @@ -402,7 +393,6 @@ void StdMeshers_NumberOfSegments::SetExpressionFunction(const char* expr) std::string StdMeshers_NumberOfSegments::CheckExpressionFunction( const std::string& expr, const int convMode) - throw (SALOME_Exception) { // remove white spaces TCollection_AsciiString str((Standard_CString)expr.c_str()); @@ -442,7 +432,6 @@ StdMeshers_NumberOfSegments::CheckExpressionFunction( const std::string& expr, //================================================================================ const char* StdMeshers_NumberOfSegments::GetExpressionFunction() const - throw(SALOME_Exception) { if (_distrType != DT_ExprFunc) throw SALOME_Exception(LOCALIZED("not an expression function distribution")); @@ -456,7 +445,6 @@ const char* StdMeshers_NumberOfSegments::GetExpressionFunction() const //================================================================================ void StdMeshers_NumberOfSegments::SetConversionMode( int conv ) - throw(SALOME_Exception) { // if (_distrType != DT_TabFunc && _distrType != DT_ExprFunc) // throw SALOME_Exception(LOCALIZED("not a functional distribution")); @@ -475,7 +463,6 @@ void StdMeshers_NumberOfSegments::SetConversionMode( int conv ) //================================================================================ int StdMeshers_NumberOfSegments::ConversionMode() const - throw(SALOME_Exception) { // if (_distrType != DT_TabFunc && _distrType != DT_ExprFunc) // throw SALOME_Exception(LOCALIZED("not a functional distribution")); diff --git a/src/StdMeshers/StdMeshers_NumberOfSegments.hxx b/src/StdMeshers/StdMeshers_NumberOfSegments.hxx index ef6967f5a..c726488ea 100644 --- a/src/StdMeshers/StdMeshers_NumberOfSegments.hxx +++ b/src/StdMeshers/StdMeshers_NumberOfSegments.hxx @@ -48,15 +48,14 @@ public: virtual ~StdMeshers_NumberOfSegments(); // Builds point distribution according to passed function - const std::vector& BuildDistributionExpr( const char*, int, int ) throw ( SALOME_Exception ); - const std::vector& BuildDistributionTab( const std::vector&, int, int ) throw ( SALOME_Exception ); + const std::vector& BuildDistributionExpr( const char*, int, int ); + const std::vector& BuildDistributionTab( const std::vector&, int, int ); /*! * \brief Set the number of segments * \param segmentsNumber - must be greater than zero */ - void SetNumberOfSegments(int segmentsNumber) - throw (SALOME_Exception); + void SetNumberOfSegments(int segmentsNumber); /*! * \brief Get the number of segments @@ -77,8 +76,7 @@ public: /*! * \brief Set distribution type */ - void SetDistrType(DistrType typ) - throw (SALOME_Exception); + void SetDistrType(DistrType typ); /*! * \brief Get distribution type @@ -92,16 +90,14 @@ public: * Throws SALOME_Exception if distribution type is not DT_Scale, * or scaleFactor is not a positive value different from 1 */ - virtual void SetScaleFactor(double scaleFactor) - throw (SALOME_Exception); + virtual void SetScaleFactor(double scaleFactor); /*! * \brief Get scale factor for scale distribution * * Throws SALOME_Exception if distribution type is not DT_Scale */ - double GetScaleFactor() const - throw (SALOME_Exception); + double GetScaleFactor() const; /*! * \brief Set table function for distribution DT_TabFunc @@ -112,16 +108,14 @@ public: * * Throws SALOME_Exception if distribution type is not DT_TabFunc */ - void SetTableFunction(const std::vector& table) - throw (SALOME_Exception); + void SetTableFunction(const std::vector& table); /*! * \brief Get table function for distribution DT_TabFunc * * Throws SALOME_Exception if distribution type is not DT_TabFunc */ - const std::vector& GetTableFunction() const - throw (SALOME_Exception); + const std::vector& GetTableFunction() const; /*! * \brief Set expression function for distribution DT_ExprFunc @@ -130,16 +124,14 @@ public: * * Throws SALOME_Exception if distribution type is not DT_ExprFunc */ - void SetExpressionFunction( const char* expr) - throw (SALOME_Exception); + void SetExpressionFunction( const char* expr); /*! * \brief Get expression function for distribution DT_ExprFunc * * Throws SALOME_Exception if distribution type is not DT_ExprFunc */ - const char* GetExpressionFunction() const - throw (SALOME_Exception); + const char* GetExpressionFunction() const; /*! * \brief Checks validity of the expression of the function f(t), e.g. "sin(t)". @@ -147,8 +139,7 @@ public: * \param convMode - 0 for "Exponent mode", 1 for "Cut negative mode" */ static std::string CheckExpressionFunction( const std::string& expr, - const int convMode) - throw (SALOME_Exception); + const int convMode); /*! * \brief Set conversion mode. When it is 0, it means "exponent mode": @@ -159,16 +150,14 @@ public: * * Throws SALOME_Exception if distribution type is not functional */ - void SetConversionMode( int conv ) - throw (SALOME_Exception); + void SetConversionMode( int conv ); /*! * \brief Returns conversion mode * * Throws SALOME_Exception if distribution type is not functional */ - int ConversionMode() const - throw (SALOME_Exception); + int ConversionMode() const; /*! * \brief Initialize number of segments by the mesh built on the geometry diff --git a/src/StdMeshers/StdMeshers_Penta_3D.cxx b/src/StdMeshers/StdMeshers_Penta_3D.cxx index 96f97933c..7dd933b0d 100644 --- a/src/StdMeshers/StdMeshers_Penta_3D.cxx +++ b/src/StdMeshers/StdMeshers_Penta_3D.cxx @@ -798,7 +798,7 @@ void StdMeshers_Penta_3D::MakeMeshOnFxy1() while(itf->more()) { const SMDS_MeshElement* pE0 = itf->next(); aElementType = pE0->GetType(); - if (!aElementType==SMDSAbs_Face) { + if (aElementType!=SMDSAbs_Face) { continue; } aNbNodes = pE0->NbNodes(); diff --git a/src/StdMeshers/StdMeshers_PolygonPerFace_2D.cxx b/src/StdMeshers/StdMeshers_PolygonPerFace_2D.cxx index c842093ec..586ec1e9c 100644 --- a/src/StdMeshers/StdMeshers_PolygonPerFace_2D.cxx +++ b/src/StdMeshers/StdMeshers_PolygonPerFace_2D.cxx @@ -60,8 +60,8 @@ StdMeshers_PolygonPerFace_2D::StdMeshers_PolygonPerFace_2D(int hypId, //purpose : //======================================================================= -bool StdMeshers_PolygonPerFace_2D::CheckHypothesis(SMESH_Mesh& theMesh, - const TopoDS_Shape& theShape, +bool StdMeshers_PolygonPerFace_2D::CheckHypothesis(SMESH_Mesh& /*theMesh*/, + const TopoDS_Shape& /*theShape*/, SMESH_Hypothesis::Hypothesis_Status& theStatus) { theStatus = HYP_OK; diff --git a/src/StdMeshers/StdMeshers_Prism_3D.cxx b/src/StdMeshers/StdMeshers_Prism_3D.cxx index b35e76ae3..0adab62b3 100644 --- a/src/StdMeshers/StdMeshers_Prism_3D.cxx +++ b/src/StdMeshers/StdMeshers_Prism_3D.cxx @@ -595,7 +595,7 @@ namespace //================================================================================ int countNbSides( const Prism_3D::TPrismTopo & thePrism, - vector & nbUnitePerEdge, + vector & /*nbUnitePerEdge*/, vector< double > & edgeLength) { int nbEdges = thePrism.myNbEdgesInWires.front(); // nb outer edges @@ -718,6 +718,8 @@ namespace cout << "mesh.AddNode( " << p[i].X() << ", "<< p[i].Y() << ", "<< p[i].Z() << ") # " << i <<" " ; SMESH_Block::DumpShapeID( i, cout ) << endl; } +#else + (void)p; // unused in release mode #endif } @@ -760,8 +762,8 @@ StdMeshers_Prism_3D::~StdMeshers_Prism_3D() //purpose : //======================================================================= -bool StdMeshers_Prism_3D::CheckHypothesis(SMESH_Mesh& aMesh, - const TopoDS_Shape& aShape, +bool StdMeshers_Prism_3D::CheckHypothesis(SMESH_Mesh& /*aMesh*/, + const TopoDS_Shape& /*aShape*/, SMESH_Hypothesis::Hypothesis_Status& aStatus) { // no hypothesis @@ -984,7 +986,7 @@ bool StdMeshers_Prism_3D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& theSh } else { - meshedFaces.push_back( prism.myBottom ); + suspectSourceFaces.push_back( prism.myBottom ); if ( prism.myAlgoSM && prism.myAlgoSM->GetAlgo() ) meshedFace2AlgoSM.Bind( prism.myBottom, prism.myAlgoSM ); } @@ -2911,7 +2913,7 @@ bool StdMeshers_Prism_3D::project2dMesh(const TopoDS_Face& theSrcFace, */ //================================================================================ -bool StdMeshers_Prism_3D::setFaceAndEdgesXYZ( const int faceID, const gp_XYZ& params, int z ) +bool StdMeshers_Prism_3D::setFaceAndEdgesXYZ( const int faceID, const gp_XYZ& params, int /*z*/ ) { // find base and top edges of the face enum { BASE = 0, TOP, LEFT, RIGHT }; @@ -4373,7 +4375,9 @@ void StdMeshers_PrismAsBlock::faceGridToPythonDump(const SMESH_Block::TShapeID f << n << ", " << n+1 << ", " << n+nb+2 << ", " << n+nb+1 << "]) " << endl; } - +#else + (void)face; // unused in release mode + (void)nb; // unused in release mode #endif } @@ -4993,6 +4997,8 @@ void StdMeshers_PrismAsBlock::TSideFace::dumpNodes(int nbNodes) const TVerticalEdgeAdaptor* vSide1 = (TVerticalEdgeAdaptor*) VertiCurve(1); cout << "Verti side 1: "; vSide1->dumpNodes(nbNodes); cout << endl; delete hSize0; delete hSize1; delete vSide0; delete vSide1; +#else + (void)nbNodes; // unused in release mode #endif } @@ -5039,6 +5045,8 @@ void StdMeshers_PrismAsBlock::TVerticalEdgeAdaptor::dumpNodes(int nbNodes) const cout << (*myNodeColumn)[i]->GetID() << " "; if ( nbNodes < (int) myNodeColumn->size() ) cout << myNodeColumn->back()->GetID(); +#else + (void)nbNodes; // unused in release mode #endif } @@ -5097,6 +5105,8 @@ void StdMeshers_PrismAsBlock::THorizontalEdgeAdaptor::dumpNodes(int nbNodes) con side->GetColumns( u , col, col2 ); if ( n != col->second[ i ] ) cout << col->second[ i ]->GetID(); +#else + (void)nbNodes; // unused in release mode #endif } diff --git a/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx b/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx index c80235fea..d89e3c6c5 100644 --- a/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx +++ b/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx @@ -72,7 +72,6 @@ StdMeshers_ProjectionSource1D::~StdMeshers_ProjectionSource1D() //============================================================================= void StdMeshers_ProjectionSource1D::SetSourceEdge(const TopoDS_Shape& edge) - throw ( SALOME_Exception ) { if ( edge.IsNull() ) throw SALOME_Exception(LOCALIZED("Null edge is not allowed")); @@ -97,7 +96,6 @@ void StdMeshers_ProjectionSource1D::SetSourceEdge(const TopoDS_Shape& edge) void StdMeshers_ProjectionSource1D::SetVertexAssociation(const TopoDS_Shape& sourceVertex, const TopoDS_Shape& targetVertex) - throw ( SALOME_Exception ) { if ( sourceVertex.IsNull() != targetVertex.IsNull() ) throw SALOME_Exception(LOCALIZED("Two or none vertices must be provided")); diff --git a/src/StdMeshers/StdMeshers_ProjectionSource1D.hxx b/src/StdMeshers/StdMeshers_ProjectionSource1D.hxx index b3945eb13..c1d5a4999 100644 --- a/src/StdMeshers/StdMeshers_ProjectionSource1D.hxx +++ b/src/StdMeshers/StdMeshers_ProjectionSource1D.hxx @@ -56,8 +56,7 @@ public: /*! * Sets source to take a mesh pattern from */ - void SetSourceEdge(const TopoDS_Shape& edge) - throw ( SALOME_Exception ); + void SetSourceEdge(const TopoDS_Shape& edge); /*! * Returns the source edge or a group containing edges @@ -85,8 +84,7 @@ public: * This parameter is optional */ void SetVertexAssociation(const TopoDS_Shape& sourceVertex, - const TopoDS_Shape& targetVertex) - throw ( SALOME_Exception ); + const TopoDS_Shape& targetVertex); /*! * Returns the vertex associated with the target vertex. diff --git a/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx b/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx index 48d97bf5a..d3334e295 100644 --- a/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx +++ b/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx @@ -73,7 +73,6 @@ StdMeshers_ProjectionSource2D::~StdMeshers_ProjectionSource2D() //============================================================================= void StdMeshers_ProjectionSource2D::SetSourceFace(const TopoDS_Shape& Face) - throw ( SALOME_Exception ) { if ( Face.IsNull() ) throw SALOME_Exception(LOCALIZED("Null Face is not allowed")); @@ -101,7 +100,6 @@ void StdMeshers_ProjectionSource2D::SetVertexAssociation(const TopoDS_Shape& sou const TopoDS_Shape& sourceVertex2, const TopoDS_Shape& targetVertex1, const TopoDS_Shape& targetVertex2) - throw ( SALOME_Exception ) { if ( sourceVertex1.IsNull() != targetVertex1.IsNull() || sourceVertex2.IsNull() != targetVertex2.IsNull() ) @@ -173,7 +171,6 @@ TopoDS_Shape StdMeshers_ProjectionSource2D::GetSourceFace() const //============================================================================= TopoDS_Vertex StdMeshers_ProjectionSource2D::GetSourceVertex(int i) const - throw ( SALOME_Exception ) { if ( i == 1 ) return _sourceVertex1; @@ -191,7 +188,6 @@ TopoDS_Vertex StdMeshers_ProjectionSource2D::GetSourceVertex(int i) const //============================================================================= TopoDS_Vertex StdMeshers_ProjectionSource2D::GetTargetVertex(int i) const - throw ( SALOME_Exception ) { if ( i == 1 ) return _targetVertex1; diff --git a/src/StdMeshers/StdMeshers_ProjectionSource2D.hxx b/src/StdMeshers/StdMeshers_ProjectionSource2D.hxx index ea0558765..ae8bd395e 100644 --- a/src/StdMeshers/StdMeshers_ProjectionSource2D.hxx +++ b/src/StdMeshers/StdMeshers_ProjectionSource2D.hxx @@ -56,8 +56,7 @@ public: /*! * Sets a source to take a mesh pattern from */ - void SetSourceFace(const TopoDS_Shape& face) - throw ( SALOME_Exception ); + void SetSourceFace(const TopoDS_Shape& face); /*! * Returns the source face or a group containing faces @@ -88,22 +87,21 @@ public: void SetVertexAssociation(const TopoDS_Shape& sourceVertex1, const TopoDS_Shape& sourceVertex2, const TopoDS_Shape& targetVertex1, - const TopoDS_Shape& targetVertex2) - throw ( SALOME_Exception ); + const TopoDS_Shape& targetVertex2); /*! * Returns the -th source vertex associated with the -th target vertex. * Result may be nil if association not set. * Valid indices are 1 and 2 */ - TopoDS_Vertex GetSourceVertex(int i) const throw ( SALOME_Exception ); + TopoDS_Vertex GetSourceVertex(int i) const; /*! * Returns the -th target vertex associated with the -th source vertex. * Result may be nil if association not set. * Valid indices are 1 and 2 */ - TopoDS_Vertex GetTargetVertex(int i) const throw ( SALOME_Exception ); + TopoDS_Vertex GetTargetVertex(int i) const; /*! * \brief Test if vertex association defined diff --git a/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx b/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx index a235a9d9e..cf6d35ebf 100644 --- a/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx +++ b/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx @@ -71,7 +71,6 @@ StdMeshers_ProjectionSource3D::~StdMeshers_ProjectionSource3D() //============================================================================= void StdMeshers_ProjectionSource3D::SetSource3DShape(const TopoDS_Shape& Shape) - throw ( SALOME_Exception ) { if ( Shape.IsNull() ) throw SALOME_Exception(LOCALIZED("Null Shape is not allowed")); @@ -99,7 +98,6 @@ void StdMeshers_ProjectionSource3D::SetVertexAssociation(const TopoDS_Shape& sou const TopoDS_Shape& sourceVertex2, const TopoDS_Shape& targetVertex1, const TopoDS_Shape& targetVertex2) - throw ( SALOME_Exception ) { if ( sourceVertex1.IsNull() != targetVertex1.IsNull() || sourceVertex2.IsNull() != targetVertex2.IsNull() || @@ -161,7 +159,6 @@ TopoDS_Shape StdMeshers_ProjectionSource3D::GetSource3DShape() const //============================================================================= TopoDS_Vertex StdMeshers_ProjectionSource3D::GetSourceVertex(int i) const - throw ( SALOME_Exception ) { if ( i == 1 ) return _sourceVertex1; @@ -179,7 +176,6 @@ TopoDS_Vertex StdMeshers_ProjectionSource3D::GetSourceVertex(int i) const //============================================================================= TopoDS_Vertex StdMeshers_ProjectionSource3D::GetTargetVertex(int i) const - throw ( SALOME_Exception ) { if ( i == 1 ) return _targetVertex1; diff --git a/src/StdMeshers/StdMeshers_ProjectionSource3D.hxx b/src/StdMeshers/StdMeshers_ProjectionSource3D.hxx index 79fc78726..799a0ec49 100644 --- a/src/StdMeshers/StdMeshers_ProjectionSource3D.hxx +++ b/src/StdMeshers/StdMeshers_ProjectionSource3D.hxx @@ -56,8 +56,7 @@ public: /*! * Sets a source to take a mesh pattern from */ - void SetSource3DShape(const TopoDS_Shape& shape) - throw ( SALOME_Exception ); + void SetSource3DShape(const TopoDS_Shape& shape); /*! * Returns the source shape @@ -82,20 +81,19 @@ public: void SetVertexAssociation(const TopoDS_Shape& sourceVertex1, const TopoDS_Shape& sourceVertex2, const TopoDS_Shape& targetVertex1, - const TopoDS_Shape& targetVertex2) - throw ( SALOME_Exception ); + const TopoDS_Shape& targetVertex2); /*! * Returns the -th source vertex associated with the -th target vertex. * Result may be nil if association not set. */ - TopoDS_Vertex GetSourceVertex(int i) const throw ( SALOME_Exception ); + TopoDS_Vertex GetSourceVertex(int i) const; /*! * Returns the -th target vertex associated with the -th source vertex. * Result may be nil if association not set. */ - TopoDS_Vertex GetTargetVertex(int i) const throw ( SALOME_Exception ); + TopoDS_Vertex GetTargetVertex(int i) const; /*! * \brief Test if vertex association defined diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx index 776be581e..3ab3d55a3 100644 --- a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx +++ b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx @@ -97,7 +97,7 @@ namespace { return max(theMeshDS[0]->ShapeToIndex(S), theMeshDS[1]->ShapeToIndex(S) ); return long(S.TShape().operator->()); } - void show_shape( TopoDS_Shape v, const char* msg ) // debug + void show_shape( TopoDS_Shape v, const char* msg ) // debug // todo: unused in release mode { if ( v.IsNull() ) cout << msg << " NULL SHAPE" << endl; else if (v.ShapeType() == TopAbs_VERTEX) { @@ -106,7 +106,7 @@ namespace { else { cout << msg << " "; TopAbs::Print((v).ShapeType(),cout) <<" "<& l ) // debug + void show_list( const char* msg, const list< TopoDS_Edge >& l ) // debug // todo: unused in release mode { cout << msg << " "; list< TopoDS_Edge >::const_iterator e = l.begin(); @@ -131,6 +131,8 @@ namespace { show_shape( TopoDS_Shape(), "avoid warning: show_shape() defined but not used"); show_list( "avoid warning: show_list() defined but not used", list< TopoDS_Edge >() ); } +#else + (void)shape; // unused in release mode #endif return false; } diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.hxx b/src/StdMeshers/StdMeshers_ProjectionUtils.hxx index 5ae1f3af1..32509f626 100644 --- a/src/StdMeshers/StdMeshers_ProjectionUtils.hxx +++ b/src/StdMeshers/StdMeshers_ProjectionUtils.hxx @@ -336,6 +336,6 @@ namespace StdMeshers_ProjectionUtils TopoDS_Edge GetBoundaryEdge(const TopoDS_Shape& edgeContainer, const SMESH_Mesh& mesh, std::list< TopoDS_Edge >* allBndEdges = 0 ); -}; +} #endif diff --git a/src/StdMeshers/StdMeshers_Projection_2D.cxx b/src/StdMeshers/StdMeshers_Projection_2D.cxx index b2700dfcc..4ef3b3f67 100644 --- a/src/StdMeshers/StdMeshers_Projection_2D.cxx +++ b/src/StdMeshers/StdMeshers_Projection_2D.cxx @@ -278,7 +278,7 @@ namespace { //================================================================================ bool getBoundaryNodes ( SMESH_subMesh* sm, - const TopoDS_Face& face, + const TopoDS_Face& /*face*/, map< double, const SMDS_MeshNode* > & u2nodes, set< const SMDS_MeshNode* > & seamNodes) { @@ -975,13 +975,13 @@ namespace { */ //================================================================================ - bool projectQuads(const TopoDS_Face& tgtFace, - const TopoDS_Face& srcFace, - const TSideVector& tgtWires, - const TSideVector& srcWires, - const TAssocTool::TShapeShapeMap& shape2ShapeMap, - TAssocTool::TNodeNodeMap& src2tgtNodes, - const bool is1DComputed) + bool projectQuads(const TopoDS_Face& /*tgtFace*/, + const TopoDS_Face& /*srcFace*/, + const TSideVector& /*tgtWires*/, + const TSideVector& /*srcWires*/, + const TAssocTool::TShapeShapeMap& /*shape2ShapeMap*/, + TAssocTool::TNodeNodeMap& /*src2tgtNodes*/, + const bool /*is1DComputed*/) { // SMESH_Mesh * tgtMesh = tgtWires[0]->GetMesh(); // SMESH_Mesh * srcMesh = srcWires[0]->GetMesh(); @@ -1562,7 +1562,9 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& // mapper changed, no more "mapper puts on a seam edge nodes from 2 edges" if ( isSeam && ! getBoundaryNodes ( sm, tgtFace, u2nodesOnSeam, seamNodes )) - ;//RETURN_BAD_RESULT("getBoundaryNodes() failed"); + { + //RETURN_BAD_RESULT("getBoundaryNodes() failed"); + } SMDS_NodeIteratorPtr nIt = smDS->GetNodes(); while ( nIt->more() ) diff --git a/src/StdMeshers/StdMeshers_Propagation.cxx b/src/StdMeshers/StdMeshers_Propagation.cxx index e8e0c3f25..3ecd623b1 100644 --- a/src/StdMeshers/StdMeshers_Propagation.cxx +++ b/src/StdMeshers/StdMeshers_Propagation.cxx @@ -588,6 +588,7 @@ namespace { clearPropagationChain( subMesh ); } // return; -- hyp is modified any way + // fall through default: //case SMESH_subMesh::MODIF_HYP: // hyp modif // clear mesh in a chain diff --git a/src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cxx b/src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cxx index 03c7e8d80..fe4fc5c35 100644 --- a/src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cxx +++ b/src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cxx @@ -260,8 +260,8 @@ namespace virtual void ProcessEvent(const int event, const int eventType, SMESH_subMesh* faceSubMesh, - SMESH_subMeshEventListenerData* data, - const SMESH_Hypothesis* hyp) + SMESH_subMeshEventListenerData* /*data*/, + const SMESH_Hypothesis* /*hyp*/) { if ( eventType == SMESH_subMesh::ALGO_EVENT ) { @@ -1248,7 +1248,7 @@ namespace //================================================================================ void separateNodes( SMESH_MesherHelper& theHelper, - const SMESH_MAT2d::MedialAxis& theMA, + const SMESH_MAT2d::MedialAxis& /*theMA*/, TMAPar2NPoints & thePointsOnE, SinuousFace& theSinuFace, const vector< bool >& theIsComputedEdge) @@ -1932,7 +1932,7 @@ namespace const vector& theShortEdges, SMESH_Algo* the1dAlgo, const bool theHasRadialHyp, - const bool theIs2nd) + const bool /*theIs2nd*/) { SMESH_Hypothesis::Hypothesis_Status aStatus; for ( size_t i = 0; i < theShortEdges.size(); ++i ) diff --git a/src/StdMeshers/StdMeshers_QuadrangleParams.cxx b/src/StdMeshers/StdMeshers_QuadrangleParams.cxx index 96e54b092..d3b5935d6 100644 --- a/src/StdMeshers/StdMeshers_QuadrangleParams.cxx +++ b/src/StdMeshers/StdMeshers_QuadrangleParams.cxx @@ -223,7 +223,7 @@ bool StdMeshers_QuadrangleParams::SetParametersByMesh(const SMESH_Mesh* theMesh, * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_QuadrangleParams::SetParametersByDefaults(const TDefaults& dflts, +bool StdMeshers_QuadrangleParams::SetParametersByDefaults(const TDefaults& /*dflts*/, const SMESH_Mesh* /*mesh*/) { return true; diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx index dca028078..fc01cab16 100644 --- a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx +++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx @@ -204,7 +204,7 @@ bool StdMeshers_Quadrangle_2D::CheckHypothesis //============================================================================= /*! - * + * Compute the mesh on the given shape */ //============================================================================= @@ -1606,7 +1606,8 @@ int StdMeshers_Quadrangle_2D::getCorners(const TopoDS_Face& theFace, //============================================================================= /*! - * + * Return FaceQuadStruct where sides ordered CCW, top and left sides + * reversed to be co-directed with bottom and right sides */ //============================================================================= @@ -3208,8 +3209,8 @@ bool StdMeshers_Quadrangle_2D::evaluateQuadPref(SMESH_Mesh & aMesh, */ //============================================================================= -void StdMeshers_Quadrangle_2D::splitQuadFace(SMESHDS_Mesh * theMeshDS, - int theFaceID, +void StdMeshers_Quadrangle_2D::splitQuadFace(SMESHDS_Mesh * /*theMeshDS*/, + int /*theFaceID*/, const SMDS_MeshNode* theNode1, const SMDS_MeshNode* theNode2, const SMDS_MeshNode* theNode3, diff --git a/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx b/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx index 5a45841e6..f2d2970af 100644 --- a/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx +++ b/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx @@ -636,4 +636,4 @@ bool StdMeshers_RadialPrism_3D::IsApplicable( const TopoDS_Shape & aShape, bool if ( !toCheckAll ) return true; } return ( toCheckAll && nbFoundSolids != 0); -}; +} diff --git a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx index 6d43372eb..4ecfb7dd8 100644 --- a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx +++ b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx @@ -164,9 +164,9 @@ namespace return &theEdgeMarker; } //! Clear edge sumbesh if something happens on face - void ProcessEvent(const int event, + void ProcessEvent(const int /*event*/, const int eventType, - SMESH_subMesh* faceSubMesh, + SMESH_subMesh* /*faceSubMesh*/, EventListenerData* edgesHolder, const SMESH_Hypothesis* /*hyp*/) { @@ -402,9 +402,9 @@ namespace */ //================================================================================ - bool isCornerInsideCircle(const StdMeshers_FaceSidePtr& CircSide, - const StdMeshers_FaceSidePtr& LinSide1, - const StdMeshers_FaceSidePtr& LinSide2) + bool isCornerInsideCircle(const StdMeshers_FaceSidePtr& /*CircSide*/, + const StdMeshers_FaceSidePtr& /*LinSide1*/, + const StdMeshers_FaceSidePtr& /*LinSide2*/) { // if ( CircSide && LinSide1 && LinSide2 ) // { @@ -439,7 +439,7 @@ namespace { // find the center and a point most distant from it - double maxDist = 0, normPar; + double maxDist = 0, normPar = 0; gp_XY uv1, uv2; for ( int i = 0; i < 32; ++i ) { @@ -1279,4 +1279,4 @@ bool StdMeshers_RadialQuadrangle_1D2D::IsApplicable( const TopoDS_Shape & aShape } if( toCheckAll && nbFoundFaces != 0 ) return true; return false; -}; +} diff --git a/src/StdMeshers/StdMeshers_Regular_1D.cxx b/src/StdMeshers/StdMeshers_Regular_1D.cxx index 77d1d66f1..c6e41cbb2 100644 --- a/src/StdMeshers/StdMeshers_Regular_1D.cxx +++ b/src/StdMeshers/StdMeshers_Regular_1D.cxx @@ -540,7 +540,7 @@ void StdMeshers_Regular_1D::SetEventListener(SMESH_subMesh* subMesh) */ //============================================================================= -void StdMeshers_Regular_1D::SubmeshRestored(SMESH_subMesh* subMesh) +void StdMeshers_Regular_1D::SubmeshRestored(SMESH_subMesh* /*subMesh*/) { } diff --git a/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cxx b/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cxx index c34c69b43..1333b47e0 100644 --- a/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cxx +++ b/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cxx @@ -75,7 +75,7 @@ StdMeshers_SegmentLengthAroundVertex::~StdMeshers_SegmentLengthAroundVertex() */ //============================================================================= -void StdMeshers_SegmentLengthAroundVertex::SetLength(double length) throw(SALOME_Exception) +void StdMeshers_SegmentLengthAroundVertex::SetLength(double length) { if (length <= 0) throw SALOME_Exception(LOCALIZED("length must be positive")); diff --git a/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.hxx b/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.hxx index 0f606d931..60f00dcc7 100644 --- a/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.hxx +++ b/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.hxx @@ -43,7 +43,7 @@ class STDMESHERS_EXPORT StdMeshers_SegmentLengthAroundVertex:public SMESH_Hypoth StdMeshers_SegmentLengthAroundVertex(int hypId, SMESH_Gen * gen); virtual ~ StdMeshers_SegmentLengthAroundVertex(); - void SetLength(double length) throw(SALOME_Exception); + void SetLength(double length); double GetLength() const; diff --git a/src/StdMeshers/StdMeshers_StartEndLength.cxx b/src/StdMeshers/StdMeshers_StartEndLength.cxx index 24788bfcb..58a5584ad 100644 --- a/src/StdMeshers/StdMeshers_StartEndLength.cxx +++ b/src/StdMeshers/StdMeshers_StartEndLength.cxx @@ -73,7 +73,6 @@ StdMeshers_StartEndLength::~StdMeshers_StartEndLength() //============================================================================= void StdMeshers_StartEndLength::SetLength(double length, bool isStartLength) - throw(SALOME_Exception) { if ( (isStartLength ? _begLength : _endLength) != length ) { if (length <= 0) diff --git a/src/StdMeshers/StdMeshers_StartEndLength.hxx b/src/StdMeshers/StdMeshers_StartEndLength.hxx index 35d3a7f85..d07d1e17d 100644 --- a/src/StdMeshers/StdMeshers_StartEndLength.hxx +++ b/src/StdMeshers/StdMeshers_StartEndLength.hxx @@ -41,7 +41,7 @@ class STDMESHERS_EXPORT StdMeshers_StartEndLength: public StdMeshers_Reversible1 StdMeshers_StartEndLength(int hypId, SMESH_Gen * gen); virtual ~ StdMeshers_StartEndLength(); - void SetLength(double length, bool isStartLength) throw(SALOME_Exception); + void SetLength(double length, bool isStartLength); double GetLength(bool isStartLength) const; diff --git a/src/StdMeshers/StdMeshers_ViscousLayers.cxx b/src/StdMeshers/StdMeshers_ViscousLayers.cxx index 310b164d5..822f1742c 100644 --- a/src/StdMeshers/StdMeshers_ViscousLayers.cxx +++ b/src/StdMeshers/StdMeshers_ViscousLayers.cxx @@ -206,8 +206,8 @@ namespace VISCOUS_3D virtual void ProcessEvent(const int event, const int eventType, SMESH_subMesh* subMesh, - SMESH_subMeshEventListenerData* data, - const SMESH_Hypothesis* hyp) + SMESH_subMeshEventListenerData* /*data*/, + const SMESH_Hypothesis* /*hyp*/) { if (( SMESH_subMesh::COMPUTE_EVENT == eventType ) && ( SMESH_subMesh::CHECK_COMPUTE_STATE != event && @@ -1091,7 +1091,7 @@ namespace VISCOUS_3D Handle(ShapeAnalysis_Surface)& surface, const TopoDS_Face& F, SMESH_MesherHelper& helper); - bool smoothComplexEdge( _SolidData& data, + bool smoothComplexEdge( _SolidData& data, Handle(ShapeAnalysis_Surface)& surface, const TopoDS_Face& F, SMESH_MesherHelper& helper); @@ -1376,8 +1376,8 @@ std::istream & StdMeshers_ViscousLayers::LoadFrom(std::istream & load) } return load; } // -------------------------------------------------------------------------------- -bool StdMeshers_ViscousLayers::SetParametersByMesh(const SMESH_Mesh* theMesh, - const TopoDS_Shape& theShape) +bool StdMeshers_ViscousLayers::SetParametersByMesh(const SMESH_Mesh* /*theMesh*/, + const TopoDS_Shape& /*theShape*/) { // TODO return false; @@ -3953,7 +3953,7 @@ gp_XYZ _ViscousBuilder::getFaceNormal(const SMDS_MeshNode* node, bool _ViscousBuilder::getFaceNormalAtSingularity( const gp_XY& uv, const TopoDS_Face& face, - SMESH_MesherHelper& helper, + SMESH_MesherHelper& /*helper*/, gp_Dir& normal ) { BRepAdaptor_Surface surface( face ); @@ -5312,7 +5312,9 @@ bool _ViscousBuilder::smoothAndCheck(_SolidData& data, } // loop on data._edgesOnShape if ( !is1stBlocked ) + { dumpFunctionEnd(); + } if ( closestFace && le ) { @@ -5525,7 +5527,7 @@ void _ViscousBuilder::makeOffsetSurface( _EdgesOnShape& eos, SMESH_MesherHelper& eos._offsetSurf = new ShapeAnalysis_Surface( surf ); } - catch ( Standard_Failure ) + catch ( Standard_Failure& ) { } } @@ -5627,8 +5629,9 @@ void _ViscousBuilder::putOnOffsetSurface( _EdgesOnShape& eos, << "_InfStep" << infStep << "_" << smooStep ); for ( ; i < eos._edges.size(); ++i ) { - if ( eos._edges[i]->Is( _LayerEdge::MARKED )) + if ( eos._edges[i]->Is( _LayerEdge::MARKED )) { dumpMove( eos._edges[i]->_nodes.back() ); + } } dumpFunctionEnd(); } @@ -6086,10 +6089,10 @@ bool _Smoother1D::smoothAnalyticEdge( _SolidData& data, */ //================================================================================ -bool _Smoother1D::smoothComplexEdge( _SolidData& data, +bool _Smoother1D::smoothComplexEdge( _SolidData& /*data*/, Handle(ShapeAnalysis_Surface)& surface, const TopoDS_Face& F, - SMESH_MesherHelper& helper) + SMESH_MesherHelper& /*helper*/) { if ( _offPoints.empty() ) return false; @@ -6746,7 +6749,7 @@ void _SolidData::AddShapesToSmooth( const set< _EdgesOnShape* >& eosToSmooth, */ //================================================================================ -void _ViscousBuilder::limitMaxLenByCurvature( _SolidData& data, SMESH_MesherHelper& helper ) +void _ViscousBuilder::limitMaxLenByCurvature( _SolidData& data, SMESH_MesherHelper& /*helper*/ ) { // find intersection of neighbor _LayerEdge's to limit _maxLen // according to local curvature (IPAL52648) @@ -6798,9 +6801,9 @@ void _ViscousBuilder::limitMaxLenByCurvature( _SolidData& data, SMESH_MesherHelp void _ViscousBuilder::limitMaxLenByCurvature( _LayerEdge* e1, _LayerEdge* e2, - _EdgesOnShape& eos1, - _EdgesOnShape& eos2, - const bool isSmoothable ) + _EdgesOnShape& /*eos1*/, + _EdgesOnShape& /*eos2*/, + const bool /*isSmoothable*/ ) { if (( e1->_nodes[0]->GetPosition()->GetDim() != e2->_nodes[0]->GetPosition()->GetDim() ) && @@ -7119,7 +7122,7 @@ void _ViscousBuilder::findEdgesToUpdateNormalNearConvexFace( _ConvexFace & bool _ViscousBuilder::updateNormals( _SolidData& data, SMESH_MesherHelper& helper, int stepNb, - double stepSize) + double /*stepSize*/) { updateNormalsOfC1Vertices( data ); @@ -7284,7 +7287,7 @@ bool _ViscousBuilder::updateNormals( _SolidData& data, _LayerEdge* edge = e2neIt->first; _LayerEdge& newEdge = e2neIt->second; _EdgesOnShape* eos = data.GetShapeEdges( edge ); - if ( edge->Is( _LayerEdge::BLOCKED && newEdge._maxLen > edge->_len )) + if ( edge->Is( _LayerEdge::BLOCKED ) && newEdge._maxLen > edge->_len ) continue; // Check if a new _normal is OK: @@ -7459,7 +7462,7 @@ bool _ViscousBuilder::isNewNormalOk( _SolidData& data, //================================================================================ bool _ViscousBuilder::updateNormalsOfSmoothed( _SolidData& data, - SMESH_MesherHelper& helper, + SMESH_MesherHelper& /*helper*/, const int nbSteps, const double stepSize ) { @@ -8917,7 +8920,7 @@ int _LayerEdge::Smooth(const int step, const bool isConcaveFace, bool findBest ) //================================================================================ void _LayerEdge::ChooseSmooFunction( const set< TGeomID >& concaveVertices, - const TNode2Edge& n2eMap) + const TNode2Edge& /*n2eMap*/) { if ( _smooFunction ) return; @@ -9110,7 +9113,7 @@ gp_XYZ _LayerEdge::smoothAngular() else norm += cross; } - catch (Standard_Failure) { // if |cross| == 0. + catch (Standard_Failure&) { // if |cross| == 0. } } gp_XYZ vec = newPos - pN; @@ -11512,7 +11515,7 @@ bool _ViscousBuilder::shrink(_SolidData& theData) bool _ViscousBuilder::prepareEdgeToShrink( _LayerEdge& edge, _EdgesOnShape& eos, SMESH_MesherHelper& helper, - const SMESHDS_SubMesh* faceSubMesh) + const SMESHDS_SubMesh* /*faceSubMesh*/) { const SMDS_MeshNode* srcNode = edge._nodes[0]; const SMDS_MeshNode* tgtNode = edge._nodes.back(); @@ -11801,7 +11804,7 @@ void _ViscousBuilder::fixBadFaces(const TopoDS_Face& F, */ //================================================================================ -bool _LayerEdge::SetNewLength2d( Handle(Geom_Surface)& surface, +bool _LayerEdge::SetNewLength2d( Handle(Geom_Surface)& /*surface*/, const TopoDS_Face& F, _EdgesOnShape& eos, SMESH_MesherHelper& helper ) diff --git a/src/StdMeshers/StdMeshers_ViscousLayers.hxx b/src/StdMeshers/StdMeshers_ViscousLayers.hxx index 76b0a340f..426257946 100644 --- a/src/StdMeshers/StdMeshers_ViscousLayers.hxx +++ b/src/StdMeshers/StdMeshers_ViscousLayers.hxx @@ -112,7 +112,7 @@ public: * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0) + virtual bool SetParametersByDefaults(const TDefaults& /*dflts*/, const SMESH_Mesh* /*theMesh*/=0) { return false; } static const char* GetHypType() { return "ViscousLayers"; } diff --git a/src/StdMeshers/StdMeshers_ViscousLayers2D.cxx b/src/StdMeshers/StdMeshers_ViscousLayers2D.cxx index 3935575a6..4b4294cd5 100644 --- a/src/StdMeshers/StdMeshers_ViscousLayers2D.cxx +++ b/src/StdMeshers/StdMeshers_ViscousLayers2D.cxx @@ -150,7 +150,7 @@ namespace VISCOUS_2D // Treat events void ProcessEvent(const int event, const int eventType, - SMESH_subMesh* subMesh, + SMESH_subMesh* /*subMesh*/, EventListenerData* data, const SMESH_Hypothesis* /*hyp*/) { @@ -509,8 +509,8 @@ StdMeshers_ViscousLayers2D::StdMeshers_ViscousLayers2D(int hypId, SMESH_Gen* gen _param_algo_dim = -2; // auxiliary hyp used by 2D algos } // -------------------------------------------------------------------------------- -bool StdMeshers_ViscousLayers2D::SetParametersByMesh(const SMESH_Mesh* theMesh, - const TopoDS_Shape& theShape) +bool StdMeshers_ViscousLayers2D::SetParametersByMesh(const SMESH_Mesh* /*theMesh*/, + const TopoDS_Shape& /*theShape*/) { // TODO ??? return false; diff --git a/src/StdMeshers/StdMeshers_ViscousLayers2D.hxx b/src/StdMeshers/StdMeshers_ViscousLayers2D.hxx index fd39653d7..9d7262163 100644 --- a/src/StdMeshers/StdMeshers_ViscousLayers2D.hxx +++ b/src/StdMeshers/StdMeshers_ViscousLayers2D.hxx @@ -68,7 +68,7 @@ public: * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0) + virtual bool SetParametersByDefaults(const TDefaults& /*dflts*/, const SMESH_Mesh* /*theMesh*/=0) { return false; } static const char* GetHypType() { return "ViscousLayers2D"; } diff --git a/src/StdMeshersGUI/StdMeshersGUI_CartesianParamCreator.cxx b/src/StdMeshersGUI/StdMeshersGUI_CartesianParamCreator.cxx index a1a4f6712..3d1c01608 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_CartesianParamCreator.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_CartesianParamCreator.cxx @@ -534,7 +534,7 @@ namespace StdMeshersGUI //================================================================================ QWidget* LineDelegate::createEditor( QWidget* parent, - const QStyleOptionViewItem& opt, + const QStyleOptionViewItem& /*opt*/, const QModelIndex& index) const { QWidget* w = 0; diff --git a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx index a088780b3..e4699906c 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx @@ -351,7 +351,7 @@ void StdMeshersGUI_DistrPreview::update() try { OCC_CATCH_SIGNALS; replot(); - } catch(Standard_Failure) { + } catch(Standard_Failure&) { } } @@ -397,7 +397,7 @@ bool StdMeshersGUI_DistrPreview::init( const QString& str ) OCC_CATCH_SIGNALS; myExpr = ExprIntrp_GenExp::Create(); myExpr->Process( ( Standard_CString ) str.toLatin1().data() ); - } catch(Standard_Failure) { + } catch(Standard_Failure&) { parsed_ok = false; } @@ -435,7 +435,7 @@ double StdMeshersGUI_DistrPreview::calc( bool& ok ) try { OCC_CATCH_SIGNALS; res = myExpr->Expression()->Evaluate( myVars, myValues ); - } catch(Standard_Failure) { + } catch(Standard_Failure&) { ok = false; res = 0.0; } @@ -462,7 +462,7 @@ bool StdMeshersGUI_DistrPreview::convert( double& v ) const // if(v < -7) v = -7.0; v = pow( 10.0, v ); - } catch(Standard_Failure) { + } catch(Standard_Failure&) { v = 0.0; ok = false; } diff --git a/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.cxx index 33c0fd684..e61e5d369 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.cxx @@ -75,7 +75,7 @@ StdMeshersGUI_FixedPointsParamWdg::LineDelegate::LineDelegate( QTreeWidget* pare } QWidget* StdMeshersGUI_FixedPointsParamWdg::LineDelegate::createEditor( QWidget* parent, - const QStyleOptionViewItem& option, + const QStyleOptionViewItem& /*option*/, const QModelIndex& index ) const { QWidget* w = 0; diff --git a/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx index 5317368ea..acf1f2a85 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx @@ -224,7 +224,7 @@ void StdMeshersGUI_LayerDistributionParamWdg::onEdit() } } -void StdMeshersGUI_LayerDistributionParamWdg::onEdited( int result ) +void StdMeshersGUI_LayerDistributionParamWdg::onEdited( int /*result*/ ) { if ( myDlg ) { diff --git a/src/StdMeshersGUI/StdMeshersGUI_PropagationHelperWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_PropagationHelperWdg.cxx index cf41b0f1e..8a5b35c7a 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_PropagationHelperWdg.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_PropagationHelperWdg.cxx @@ -355,11 +355,11 @@ void StdMeshersGUI_PropagationHelperWdg::updateList(bool enable) item->setData( Qt::UserRole, -1 ); } else - for ( size_t i = 0; i < myChains.size(); ++i ) + for ( int i = 0; i < (int)myChains.size(); ++i ) { QString text = tr( "CHAIN_NUM_NB_EDGES" ).arg( i+1 ).arg( myChains[i].size() ); item = new QListWidgetItem( text, myListWidget ); - item->setData( Qt::UserRole, (int) i ); + item->setData( Qt::UserRole, i ); } } else @@ -379,8 +379,8 @@ std::vector< int > * StdMeshersGUI_PropagationHelperWdg::getSelectedChain() std::vector< int > * chain = 0; if ( QListWidgetItem * item = myListWidget->currentItem() ) { - size_t i = (size_t) item->data( Qt::UserRole ).toInt(); - if ( 0 <= i && i < myChains.size() ) + int i = item->data( Qt::UserRole ).toInt(); + if ( 0 <= i && i < (int)myChains.size() ) chain = & myChains[i]; } return chain; diff --git a/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx index c6905e049..90d92443b 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx @@ -499,8 +499,8 @@ ItemDelegate::ItemDelegate( QObject* parent ) : QItemDelegate( parent ) */ QWidget* StdMeshersGUI_QuadrangleParamCreator:: ItemDelegate::createEditor( QWidget* parent, - const QStyleOptionViewItem& option, - const QModelIndex& index ) const + const QStyleOptionViewItem& /*option*/, + const QModelIndex& /*index*/ ) const { SMESHGUI_SpinBox* sb = new SMESHGUI_SpinBox( parent ); sb->RangeStepAndValidator( COORD_MIN, COORD_MAX, 10 ); diff --git a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx index 7772bc40e..b8d2c8863 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx @@ -1571,7 +1571,7 @@ QString StdMeshersGUI_StdHypothesisCreator::hypTypeName( const QString& t ) cons //purpose : is called from buildStdFrame() //======================================================================= -QWidget* StdMeshersGUI_StdHypothesisCreator::getCustomWidget( const StdParam & param, +QWidget* StdMeshersGUI_StdHypothesisCreator::getCustomWidget( const StdParam & /*param*/, QWidget* parent, const int index) const { @@ -1734,7 +1734,7 @@ void StdMeshersGUI_StdHypothesisCreator::valueChanged( QWidget* paramWidget) */ //================================================================================ -bool StdMeshersGUI_StdHypothesisCreator::initVariableName(SMESH::SMESH_Hypothesis_var theHyp, +bool StdMeshersGUI_StdHypothesisCreator::initVariableName(SMESH::SMESH_Hypothesis_var /*theHyp*/, StdParam & theParams, const char* theMethod) const { diff --git a/src/StdMeshers_I/StdMeshers_Adaptive1D_i.cxx b/src/StdMeshers_I/StdMeshers_Adaptive1D_i.cxx index e5dffa298..dd0b1a4a2 100644 --- a/src/StdMeshers_I/StdMeshers_Adaptive1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Adaptive1D_i.cxx @@ -62,7 +62,6 @@ StdMeshers_Adaptive1D_i::~StdMeshers_Adaptive1D_i() //======================================================================= void StdMeshers_Adaptive1D_i::SetMinSize( CORBA::Double minSegLen ) - throw (SALOME::SALOME_Exception) { ASSERT( myBaseImpl ); try { @@ -93,7 +92,6 @@ CORBA::Double StdMeshers_Adaptive1D_i::GetMinSize() //======================================================================= void StdMeshers_Adaptive1D_i::SetMaxSize( CORBA::Double maxSegLen ) - throw (SALOME::SALOME_Exception) { ASSERT( myBaseImpl ); try { @@ -124,7 +122,6 @@ CORBA::Double StdMeshers_Adaptive1D_i::GetMaxSize() //======================================================================= void StdMeshers_Adaptive1D_i::SetDeflection( CORBA::Double theValue ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { diff --git a/src/StdMeshers_I/StdMeshers_Adaptive1D_i.hxx b/src/StdMeshers_I/StdMeshers_Adaptive1D_i.hxx index dc156a299..c9c2da4cb 100644 --- a/src/StdMeshers_I/StdMeshers_Adaptive1D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_Adaptive1D_i.hxx @@ -53,20 +53,20 @@ class STDMESHERS_I_EXPORT StdMeshers_Adaptive1D_i: /*! * Sets minimal allowed segment length */ - void SetMinSize( CORBA::Double minSegLen ) throw (SALOME::SALOME_Exception); + void SetMinSize( CORBA::Double minSegLen ); CORBA::Double GetMinSize(); /*! * Sets maximal allowed segment length */ - void SetMaxSize( CORBA::Double maxSegLen ) throw (SALOME::SALOME_Exception); + void SetMaxSize( CORBA::Double maxSegLen ); CORBA::Double GetMaxSize(); /*! * Sets parameter value, * i.e. a maximal allowed distance between a segment and an edge. */ - void SetDeflection( CORBA::Double theLength ) throw (SALOME::SALOME_Exception); + void SetDeflection( CORBA::Double theLength ); CORBA::Double GetDeflection(); @@ -85,10 +85,10 @@ class STDMESHERS_I_EXPORT StdMeshers_Adaptive1D_i: CORBA::Boolean IsDimSupported( SMESH::Dimension type ); // Methods for copying mesh definition to other geometry - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return false; } - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return false; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; #endif diff --git a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx index 34d41e2c1..88e0d8160 100644 --- a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx @@ -77,7 +77,6 @@ StdMeshers_Arithmetic1D_i::~StdMeshers_Arithmetic1D_i() void StdMeshers_Arithmetic1D_i::SetLength(CORBA::Double theLength, CORBA::Boolean theIsStart ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -101,7 +100,6 @@ void StdMeshers_Arithmetic1D_i::SetLength(CORBA::Double theLength, //============================================================================= void StdMeshers_Arithmetic1D_i::SetStartLength( CORBA::Double length) - throw (SALOME::SALOME_Exception) { SetLength( length, true ); } @@ -113,7 +111,6 @@ void StdMeshers_Arithmetic1D_i::SetStartLength( CORBA::Double length) //============================================================================= void StdMeshers_Arithmetic1D_i::SetEndLength( CORBA::Double length) - throw (SALOME::SALOME_Exception) { SetLength( length, false ); } @@ -166,7 +163,7 @@ CORBA::Boolean StdMeshers_Arithmetic1D_i::IsDimSupported( SMESH::Dimension type //================================================================================ std::string StdMeshers_Arithmetic1D_i::getMethodOfParameter(const int paramIndex, - int nbVars) const + int /*nbVars*/) const { return paramIndex == 0 ? "SetStartLength" : "SetEndLength"; } diff --git a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.hxx b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.hxx index abca74088..0a2957150 100644 --- a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.hxx @@ -53,14 +53,13 @@ public: // Set length // * OBSOLETE *. Avoid such a way of interface design - void SetLength( CORBA::Double theLength, CORBA::Boolean theIsStart ) - throw ( SALOME::SALOME_Exception ); + void SetLength( CORBA::Double theLength, CORBA::Boolean theIsStart ); // Sets parameter value - void SetStartLength( CORBA::Double length) throw (SALOME::SALOME_Exception); + void SetStartLength( CORBA::Double length); // Sets parameter value - void SetEndLength( CORBA::Double length) throw (SALOME::SALOME_Exception); + void SetEndLength( CORBA::Double length); // Get length CORBA::Double GetLength(CORBA::Boolean theIsStart); diff --git a/src/StdMeshers_I/StdMeshers_AutomaticLength_i.cxx b/src/StdMeshers_I/StdMeshers_AutomaticLength_i.cxx index 846dcfd3d..31777735e 100644 --- a/src/StdMeshers_I/StdMeshers_AutomaticLength_i.cxx +++ b/src/StdMeshers_I/StdMeshers_AutomaticLength_i.cxx @@ -76,7 +76,6 @@ StdMeshers_AutomaticLength_i::~StdMeshers_AutomaticLength_i() //============================================================================= void StdMeshers_AutomaticLength_i::SetFineness( CORBA::Double theFineness ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { diff --git a/src/StdMeshers_I/StdMeshers_AutomaticLength_i.hxx b/src/StdMeshers_I/StdMeshers_AutomaticLength_i.hxx index 637ade5a1..d434b00b7 100644 --- a/src/StdMeshers_I/StdMeshers_AutomaticLength_i.hxx +++ b/src/StdMeshers_I/StdMeshers_AutomaticLength_i.hxx @@ -55,8 +55,7 @@ public: virtual ~StdMeshers_AutomaticLength_i(); // Set Fineness - void SetFineness( CORBA::Double theFineness ) - throw ( SALOME::SALOME_Exception ); + void SetFineness( CORBA::Double theFineness ); // Get Fineness CORBA::Double GetFineness(); @@ -68,10 +67,10 @@ public: CORBA::Boolean IsDimSupported( SMESH::Dimension type ); // Methods for copying mesh definition to other geometry - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return false; } - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return false; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; #endif diff --git a/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.cxx b/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.cxx index 41a6b3b41..52e16e843 100644 --- a/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.cxx @@ -87,7 +87,7 @@ StdMeshers_CartesianParameters3D_i::~StdMeshers_CartesianParameters3D_i() void StdMeshers_CartesianParameters3D_i::SetGrid(const SMESH::double_array& coords, CORBA::Short axis) - throw (SALOME::SALOME_Exception) + { std::vector coordVec;//, yCoords, zCoords; _array2vec( coords, coordVec, ); @@ -111,7 +111,7 @@ void StdMeshers_CartesianParameters3D_i::SetGrid(const SMESH::double_array& coor //============================================================================= SMESH::double_array* StdMeshers_CartesianParameters3D_i::GetGrid(CORBA::Short axis) - throw (SALOME::SALOME_Exception) + { std::vector coordVec; ASSERT( myBaseImpl ); @@ -135,7 +135,7 @@ SMESH::double_array* StdMeshers_CartesianParameters3D_i::GetGrid(CORBA::Short ax //============================================================================= void StdMeshers_CartesianParameters3D_i::SetSizeThreshold(CORBA::Double threshold) - throw (SALOME::SALOME_Exception) + { ASSERT( myBaseImpl ); try { @@ -172,7 +172,7 @@ CORBA::Double StdMeshers_CartesianParameters3D_i::GetSizeThreshold() void StdMeshers_CartesianParameters3D_i::SetGridSpacing(const SMESH::string_array& spaceFunctions, const SMESH::double_array& internalPoints, CORBA::Short axis) - throw (SALOME::SALOME_Exception) + { std::vector funVec; std::vector pointVec; @@ -201,7 +201,7 @@ void StdMeshers_CartesianParameters3D_i::SetGridSpacing(const SMESH::string_arra void StdMeshers_CartesianParameters3D_i::GetGridSpacing(SMESH::string_array_out xSpaceFunctions, SMESH::double_array_out xInternalPoints, CORBA::Short axis) - throw (SALOME::SALOME_Exception) + { ASSERT( myBaseImpl ); try { @@ -228,7 +228,7 @@ void StdMeshers_CartesianParameters3D_i::GetGridSpacing(SMESH::string_array_out void StdMeshers_CartesianParameters3D_i::SetAxesDirs(const SMESH::DirStruct& xDir, const SMESH::DirStruct& yDir, const SMESH::DirStruct& zDir) - throw (SALOME::SALOME_Exception) + { double coords[9]; coords[0] = xDir.PS.x; @@ -440,7 +440,7 @@ ComputeOptimalAxesDirs(GEOM::GEOM_Object_ptr go, SMESH::DirStruct& xDir, SMESH::DirStruct& yDir, SMESH::DirStruct& zDir) - throw (SALOME::SALOME_Exception) + { TopoDS_Shape shape = SMESH_Gen_i::GetSMESHGen()->GeomObjectToShape( go ); if ( shape.IsNull() ) @@ -471,7 +471,7 @@ StdMeshers_CartesianParameters3D_i::ComputeCoordinates(CORBA::Double const SMESH::string_array& spaceFuns, const SMESH::double_array& points, const char* axisName ) - throw (SALOME::SALOME_Exception) + { std::vector xFuns; std::vector xPoints, coords; diff --git a/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.hxx b/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.hxx index 874301d6b..8b264fe3d 100644 --- a/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.hxx @@ -56,15 +56,15 @@ class STDMESHERS_I_EXPORT StdMeshers_CartesianParameters3D_i: * it's size is \athreshold times less than the size of the initial hexahedron. * threshold must be > 1.0 */ - void SetSizeThreshold(CORBA::Double threshold) throw (SALOME::SALOME_Exception); + void SetSizeThreshold(CORBA::Double threshold); CORBA::Double GetSizeThreshold(); /*! * \brief Set node coordinates along an axis (counterd from zero) */ void SetGrid(const SMESH::double_array& coords, - CORBA::Short axis) throw (SALOME::SALOME_Exception); - SMESH::double_array* GetGrid(CORBA::Short axis) throw (SALOME::SALOME_Exception); + CORBA::Short axis); + SMESH::double_array* GetGrid(CORBA::Short axis); /*! * \brief Set grid spacing along an axis @@ -77,17 +77,17 @@ class STDMESHERS_I_EXPORT StdMeshers_CartesianParameters3D_i: */ void SetGridSpacing(const SMESH::string_array& spaceFunctions, const SMESH::double_array& internalPoints, - CORBA::Short axis) throw (SALOME::SALOME_Exception); + CORBA::Short axis); void GetGridSpacing(SMESH::string_array_out xSpaceFunctions, SMESH::double_array_out xInternalPoints, - CORBA::Short axis) throw (SALOME::SALOME_Exception); + CORBA::Short axis); /*! * Set custom direction of axes */ void SetAxesDirs(const SMESH::DirStruct& x, const SMESH::DirStruct& y, - const SMESH::DirStruct& z) throw (SALOME::SALOME_Exception); + const SMESH::DirStruct& z); void GetAxesDirs(SMESH::DirStruct& x, SMESH::DirStruct& y, SMESH::DirStruct& z); @@ -139,7 +139,7 @@ class STDMESHERS_I_EXPORT StdMeshers_CartesianParameters3D_i: CORBA::Boolean isOrthogonal, SMESH::DirStruct& x, SMESH::DirStruct& y, - SMESH::DirStruct& z) throw (SALOME::SALOME_Exception); + SMESH::DirStruct& z); /*! * \brief Compute node coordinates by spacing functions * \param x0 - lower coordinate @@ -152,8 +152,7 @@ class STDMESHERS_I_EXPORT StdMeshers_CartesianParameters3D_i: CORBA::Double x1, const SMESH::string_array& spaceFuns, const SMESH::double_array& points, - const char* axisName ) - throw (SALOME::SALOME_Exception); + const char* axisName ); // Get implementation ::StdMeshers_CartesianParameters3D* GetImpl(); @@ -163,10 +162,10 @@ class STDMESHERS_I_EXPORT StdMeshers_CartesianParameters3D_i: // Methods for copying mesh definition to other geometry - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return false; } - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return false; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; #endif diff --git a/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx b/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx index d96c151bc..137371b16 100644 --- a/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx @@ -76,7 +76,6 @@ StdMeshers_Deflection1D_i::~StdMeshers_Deflection1D_i() //============================================================================= void StdMeshers_Deflection1D_i::SetDeflection( CORBA::Double theValue ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -138,7 +137,7 @@ CORBA::Boolean StdMeshers_Deflection1D_i::IsDimSupported( SMESH::Dimension type */ //================================================================================ -std::string StdMeshers_Deflection1D_i::getMethodOfParameter(const int paramIndex, +std::string StdMeshers_Deflection1D_i::getMethodOfParameter(const int /*paramIndex*/, int /*nbVars*/) const { return "SetDeflection"; diff --git a/src/StdMeshers_I/StdMeshers_Deflection1D_i.hxx b/src/StdMeshers_I/StdMeshers_Deflection1D_i.hxx index 86afd2499..e7b1983a4 100644 --- a/src/StdMeshers_I/StdMeshers_Deflection1D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_Deflection1D_i.hxx @@ -54,8 +54,7 @@ public: virtual ~StdMeshers_Deflection1D_i(); // Set deflection - void SetDeflection( CORBA::Double theLength ) - throw ( SALOME::SALOME_Exception ); + void SetDeflection( CORBA::Double theLength ); // Get deflection CORBA::Double GetDeflection(); @@ -66,10 +65,10 @@ public: CORBA::Boolean IsDimSupported( SMESH::Dimension type ); // Methods for copying mesh definition to other geometry - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return false; } - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return false; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } protected: virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const; }; diff --git a/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.cxx b/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.cxx index 642676cc8..7829c7ec0 100644 --- a/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.cxx @@ -72,7 +72,7 @@ StdMeshers_FixedPoints1D_i::~StdMeshers_FixedPoints1D_i() //============================================================================= void StdMeshers_FixedPoints1D_i::SetNbSegments(const SMESH::long_array& listNbSeg) - throw ( SALOME::SALOME_Exception ) + { ASSERT( myBaseImpl ); try { @@ -98,7 +98,7 @@ void StdMeshers_FixedPoints1D_i::SetNbSegments(const SMESH::long_array& listNbSe //============================================================================= void StdMeshers_FixedPoints1D_i::SetPoints(const SMESH::double_array& listParams) - throw ( SALOME::SALOME_Exception ) + { ASSERT( myBaseImpl ); try { diff --git a/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.hxx b/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.hxx index b2d7ead28..92a824568 100644 --- a/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.hxx @@ -52,10 +52,8 @@ public: // (additionally it is neecessary to check orientation of edges and // create list of reversed edges if it is needed) and sets numbers // of segments between given points (default values are equals 1) - void SetPoints(const SMESH::double_array& listParams) - throw ( SALOME::SALOME_Exception ); - void SetNbSegments(const SMESH::long_array& listNbSeg) - throw ( SALOME::SALOME_Exception ); + void SetPoints(const SMESH::double_array& listParams); + void SetNbSegments(const SMESH::long_array& listNbSeg); // Returns list of point's parameters SMESH::double_array* GetPoints(); diff --git a/src/StdMeshers_I/StdMeshers_Geometric1D_i.cxx b/src/StdMeshers_I/StdMeshers_Geometric1D_i.cxx index d7570fe4b..7954948f8 100644 --- a/src/StdMeshers_I/StdMeshers_Geometric1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Geometric1D_i.cxx @@ -57,7 +57,6 @@ StdMeshers_Geometric1D_i::StdMeshers_Geometric1D_i( PortableServer::POA_ptr theP //============================================================================= void StdMeshers_Geometric1D_i::SetStartLength( CORBA::Double theLength ) - throw (SALOME::SALOME_Exception) { try { this->GetImpl()->SetStartLength( theLength ); @@ -77,7 +76,6 @@ void StdMeshers_Geometric1D_i::SetStartLength( CORBA::Double theLength ) //============================================================================= void StdMeshers_Geometric1D_i::SetCommonRatio( CORBA::Double factor ) - throw (SALOME::SALOME_Exception) { try { this->GetImpl()->SetCommonRatio( factor ); diff --git a/src/StdMeshers_I/StdMeshers_Geometric1D_i.hxx b/src/StdMeshers_I/StdMeshers_Geometric1D_i.hxx index 08e4a02e5..225c35345 100644 --- a/src/StdMeshers_I/StdMeshers_Geometric1D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_Geometric1D_i.hxx @@ -49,8 +49,8 @@ class STDMESHERS_I_EXPORT StdMeshers_Geometric1D_i: StdMeshers_Geometric1D_i( PortableServer::POA_ptr thePOA, ::SMESH_Gen* theGenImpl ); - void SetStartLength(CORBA::Double length) throw(SALOME::SALOME_Exception); - void SetCommonRatio(CORBA::Double factor) throw(SALOME::SALOME_Exception); + void SetStartLength(CORBA::Double length); + void SetCommonRatio(CORBA::Double factor); CORBA::Double GetStartLength(); CORBA::Double GetCommonRatio(); diff --git a/src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx b/src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx index 987be1ab2..b406c24bd 100644 --- a/src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx @@ -86,7 +86,7 @@ StdMeshers_Hexa_3D_i::~StdMeshers_Hexa_3D_i() */ //============================================================================= -bool StdMeshers_Hexa_3D_i::IsApplicable( const TopoDS_Shape &S, bool toCheckAll, int algoDim ) +bool StdMeshers_Hexa_3D_i::IsApplicable( const TopoDS_Shape &S, bool toCheckAll, int /*algoDim*/ ) { return ::StdMeshers_Hexa_3D::IsApplicable( S, toCheckAll ); } diff --git a/src/StdMeshers_I/StdMeshers_ImportSource1D_i.hxx b/src/StdMeshers_I/StdMeshers_ImportSource1D_i.hxx index e540d0603..8d137c6af 100644 --- a/src/StdMeshers_I/StdMeshers_ImportSource1D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_ImportSource1D_i.hxx @@ -69,12 +69,12 @@ class STDMESHERS_I_EXPORT StdMeshers_ImportSource1D_i: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } private: SMESH::string_array_var _groupEntries; std::vector< std::string > _groupIDs; diff --git a/src/StdMeshers_I/StdMeshers_ImportSource2D_i.hxx b/src/StdMeshers_I/StdMeshers_ImportSource2D_i.hxx index 39648b68e..4a71f0479 100644 --- a/src/StdMeshers_I/StdMeshers_ImportSource2D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_ImportSource2D_i.hxx @@ -69,12 +69,12 @@ class STDMESHERS_I_EXPORT StdMeshers_ImportSource2D_i: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } private: SMESH::string_array_var _groupEntries; std::vector< std::string > _groupIDs; diff --git a/src/StdMeshers_I/StdMeshers_LayerDistribution2D_i.hxx b/src/StdMeshers_I/StdMeshers_LayerDistribution2D_i.hxx index e93179219..2f8a1a1a2 100644 --- a/src/StdMeshers_I/StdMeshers_LayerDistribution2D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_LayerDistribution2D_i.hxx @@ -59,12 +59,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; #endif diff --git a/src/StdMeshers_I/StdMeshers_LayerDistribution_i.cxx b/src/StdMeshers_I/StdMeshers_LayerDistribution_i.cxx index bfe81b3b7..7f9b2e591 100644 --- a/src/StdMeshers_I/StdMeshers_LayerDistribution_i.cxx +++ b/src/StdMeshers_I/StdMeshers_LayerDistribution_i.cxx @@ -76,7 +76,6 @@ StdMeshers_LayerDistribution_i::~StdMeshers_LayerDistribution_i() //============================================================================= void StdMeshers_LayerDistribution_i::SetLayerDistribution(SMESH::SMESH_Hypothesis_ptr hyp1D) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { diff --git a/src/StdMeshers_I/StdMeshers_LayerDistribution_i.hxx b/src/StdMeshers_I/StdMeshers_LayerDistribution_i.hxx index e9a9a4598..70832f484 100644 --- a/src/StdMeshers_I/StdMeshers_LayerDistribution_i.hxx +++ b/src/StdMeshers_I/StdMeshers_LayerDistribution_i.hxx @@ -58,8 +58,7 @@ public: * \brief Sets 1D hypothesis specifying distribution of layers * \param hyp1D - 1D hypothesis */ - void SetLayerDistribution(SMESH::SMESH_Hypothesis_ptr hyp1D) - throw ( SALOME::SALOME_Exception ); + void SetLayerDistribution(SMESH::SMESH_Hypothesis_ptr hyp1D); /*! * \brief Returns 1D hypothesis specifying distribution of layers @@ -82,12 +81,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } protected: // restore myMethod2VarParams by parameters stored in an old study virtual void setOldParameters (const char* theParameters); diff --git a/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx b/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx index e8577667b..2b2c1edf5 100644 --- a/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx +++ b/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx @@ -73,7 +73,6 @@ StdMeshers_LengthFromEdges_i::~StdMeshers_LengthFromEdges_i() //============================================================================= void StdMeshers_LengthFromEdges_i::SetMode( CORBA::Long theMode ) - throw (SALOME::SALOME_Exception) { ASSERT( myBaseImpl ); try { diff --git a/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.hxx b/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.hxx index a07b201c5..404e95e20 100644 --- a/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.hxx +++ b/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.hxx @@ -53,8 +53,7 @@ public: virtual ~StdMeshers_LengthFromEdges_i(); // Set mode - void SetMode( CORBA::Long theMode ) - throw ( SALOME::SALOME_Exception ); + void SetMode( CORBA::Long theMode ); // Get mode CORBA::Long GetMode(); @@ -71,12 +70,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; #endif diff --git a/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx b/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx index 828411385..045dfa8ad 100644 --- a/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx +++ b/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx @@ -75,7 +75,6 @@ StdMeshers_LocalLength_i::~StdMeshers_LocalLength_i() */ //============================================================================= void StdMeshers_LocalLength_i::SetLength( CORBA::Double theLength ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -98,7 +97,6 @@ void StdMeshers_LocalLength_i::SetLength( CORBA::Double theLength ) */ //============================================================================= void StdMeshers_LocalLength_i::SetPrecision( CORBA::Double thePrecision ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { diff --git a/src/StdMeshers_I/StdMeshers_LocalLength_i.hxx b/src/StdMeshers_I/StdMeshers_LocalLength_i.hxx index a8e18238b..b98f696f3 100644 --- a/src/StdMeshers_I/StdMeshers_LocalLength_i.hxx +++ b/src/StdMeshers_I/StdMeshers_LocalLength_i.hxx @@ -54,11 +54,9 @@ public: virtual ~StdMeshers_LocalLength_i(); // Set length - void SetLength( CORBA::Double theLength ) - throw ( SALOME::SALOME_Exception ); + void SetLength( CORBA::Double theLength ); // Set precision - void SetPrecision( CORBA::Double thePrecision ) - throw ( SALOME::SALOME_Exception ); + void SetPrecision( CORBA::Double thePrecision ); // Get length CORBA::Double GetLength(); @@ -76,12 +74,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } protected: virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const; }; diff --git a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx index 4a07149a0..7d2433a41 100644 --- a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx +++ b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx @@ -76,7 +76,6 @@ StdMeshers_MaxElementArea_i::~StdMeshers_MaxElementArea_i() //============================================================================= void StdMeshers_MaxElementArea_i::SetMaxElementArea( CORBA::Double theArea ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -138,7 +137,7 @@ CORBA::Boolean StdMeshers_MaxElementArea_i::IsDimSupported( SMESH::Dimension typ */ //================================================================================ -std::string StdMeshers_MaxElementArea_i::getMethodOfParameter(const int paramIndex, +std::string StdMeshers_MaxElementArea_i::getMethodOfParameter(const int /*paramIndex*/, int /*nbVars*/) const { return "SetMaxElementArea"; diff --git a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.hxx b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.hxx index b9621cba4..1a54e5d51 100644 --- a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.hxx +++ b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.hxx @@ -52,8 +52,7 @@ public: virtual ~StdMeshers_MaxElementArea_i(); // Set maximum element area - void SetMaxElementArea( CORBA::Double theArea ) - throw ( SALOME::SALOME_Exception ); + void SetMaxElementArea( CORBA::Double theArea ); // Get maximum element area CORBA::Double GetMaxElementArea(); @@ -68,12 +67,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } protected: virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const; diff --git a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx index bd818a270..e0ee663dd 100644 --- a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx +++ b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx @@ -76,7 +76,6 @@ StdMeshers_MaxElementVolume_i::~StdMeshers_MaxElementVolume_i() //============================================================================= void StdMeshers_MaxElementVolume_i::SetMaxElementVolume( CORBA::Double theVolume ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { diff --git a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.hxx b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.hxx index 692fd8ca6..598f6e67b 100644 --- a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.hxx +++ b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.hxx @@ -52,8 +52,7 @@ public: virtual ~StdMeshers_MaxElementVolume_i(); // Set maximum element volume - void SetMaxElementVolume( CORBA::Double theVolume ) - throw (SALOME::SALOME_Exception); + void SetMaxElementVolume( CORBA::Double theVolume ); // Get maximum element volume CORBA::Double GetMaxElementVolume(); @@ -68,12 +67,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } protected: virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const; }; diff --git a/src/StdMeshers_I/StdMeshers_MaxLength_i.cxx b/src/StdMeshers_I/StdMeshers_MaxLength_i.cxx index 85077ee16..e6615ab46 100644 --- a/src/StdMeshers_I/StdMeshers_MaxLength_i.cxx +++ b/src/StdMeshers_I/StdMeshers_MaxLength_i.cxx @@ -70,7 +70,6 @@ StdMeshers_MaxLength_i::~StdMeshers_MaxLength_i() */ //============================================================================= void StdMeshers_MaxLength_i::SetLength( CORBA::Double theLength ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -91,7 +90,6 @@ void StdMeshers_MaxLength_i::SetLength( CORBA::Double theLength ) */ //============================================================================= void StdMeshers_MaxLength_i::SetUsePreestimatedLength( CORBA::Boolean toUse ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { diff --git a/src/StdMeshers_I/StdMeshers_MaxLength_i.hxx b/src/StdMeshers_I/StdMeshers_MaxLength_i.hxx index 744fa7e59..a271b8e73 100644 --- a/src/StdMeshers_I/StdMeshers_MaxLength_i.hxx +++ b/src/StdMeshers_I/StdMeshers_MaxLength_i.hxx @@ -49,13 +49,11 @@ public: virtual ~StdMeshers_MaxLength_i(); // Set length - void SetLength( CORBA::Double theLength ) - throw ( SALOME::SALOME_Exception ); + void SetLength( CORBA::Double theLength ); // Set precision // Sets preestimation flag - void SetUsePreestimatedLength( CORBA::Boolean toUse) - throw ( SALOME::SALOME_Exception ); + void SetUsePreestimatedLength( CORBA::Boolean toUse); // Get length CORBA::Double GetLength(); @@ -82,12 +80,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } protected: virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const; }; diff --git a/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.hxx b/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.hxx index 7c04e205d..730b93ac6 100644 --- a/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.hxx +++ b/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.hxx @@ -55,12 +55,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } protected: ::StdMeshers_NotConformAllowed* _impl; }; diff --git a/src/StdMeshers_I/StdMeshers_NumberOfLayers2D_i.hxx b/src/StdMeshers_I/StdMeshers_NumberOfLayers2D_i.hxx index ee1b2c0fb..df014dd24 100644 --- a/src/StdMeshers_I/StdMeshers_NumberOfLayers2D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_NumberOfLayers2D_i.hxx @@ -57,12 +57,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; #endif diff --git a/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.cxx index c0b74293c..c959e0804 100644 --- a/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.cxx +++ b/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.cxx @@ -75,7 +75,6 @@ StdMeshers_NumberOfLayers_i::~StdMeshers_NumberOfLayers_i() //============================================================================= void StdMeshers_NumberOfLayers_i::SetNumberOfLayers(CORBA::Long numberOfLayers) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { diff --git a/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.hxx b/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.hxx index 3bbc12e82..09955fdea 100644 --- a/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.hxx +++ b/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.hxx @@ -56,8 +56,7 @@ public: virtual ~StdMeshers_NumberOfLayers_i(); // Sets parameter value - void SetNumberOfLayers(CORBA::Long numberOfLayers) - throw ( SALOME::SALOME_Exception ); + void SetNumberOfLayers(CORBA::Long numberOfLayers); // Returns parameter value CORBA::Long GetNumberOfLayers(); @@ -73,12 +72,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } protected: virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const; }; diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx index f715416c7..1d1687253 100644 --- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx +++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx @@ -76,7 +76,6 @@ StdMeshers_NumberOfSegments_i::~StdMeshers_NumberOfSegments_i() SMESH::double_array* StdMeshers_NumberOfSegments_i::BuildDistributionExpr( const char* func, CORBA::Long nbSeg, CORBA::Long conv ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try @@ -98,7 +97,6 @@ SMESH::double_array* StdMeshers_NumberOfSegments_i::BuildDistributionTab( const SMESH::double_array& func, CORBA::Long nbSeg, CORBA::Long conv ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); @@ -130,7 +128,6 @@ StdMeshers_NumberOfSegments_i::BuildDistributionTab( const SMESH::double_array& //============================================================================= void StdMeshers_NumberOfSegments_i::SetNumberOfSegments( CORBA::Long theSegmentsNumber ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -165,7 +162,6 @@ CORBA::Long StdMeshers_NumberOfSegments_i::GetNumberOfSegments() //============================================================================= void StdMeshers_NumberOfSegments_i::SetDistrType(CORBA::Long typ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -203,7 +199,6 @@ CORBA::Long StdMeshers_NumberOfSegments_i::GetDistrType() //============================================================================= void StdMeshers_NumberOfSegments_i::SetScaleFactor( CORBA::Double theScaleFactor ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -226,7 +221,6 @@ void StdMeshers_NumberOfSegments_i::SetScaleFactor( CORBA::Double theScaleFactor //============================================================================= CORBA::Double StdMeshers_NumberOfSegments_i::GetScaleFactor() - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); double scale; @@ -246,7 +240,6 @@ CORBA::Double StdMeshers_NumberOfSegments_i::GetScaleFactor() //============================================================================= void StdMeshers_NumberOfSegments_i::SetTableFunction(const SMESH::double_array& table) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); std::vector tbl( table.length() ); @@ -269,7 +262,6 @@ void StdMeshers_NumberOfSegments_i::SetTableFunction(const SMESH::double_array& //============================================================================= SMESH::double_array* StdMeshers_NumberOfSegments_i::GetTableFunction() - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); const std::vector* tbl; @@ -292,7 +284,6 @@ SMESH::double_array* StdMeshers_NumberOfSegments_i::GetTableFunction() //============================================================================= void StdMeshers_NumberOfSegments_i::SetExpressionFunction(const char* expr) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -312,7 +303,6 @@ void StdMeshers_NumberOfSegments_i::SetExpressionFunction(const char* expr) //============================================================================= char* StdMeshers_NumberOfSegments_i::GetExpressionFunction() - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); const char* expr; @@ -332,7 +322,6 @@ char* StdMeshers_NumberOfSegments_i::GetExpressionFunction() //============================================================================= void StdMeshers_NumberOfSegments_i::SetConversionMode(CORBA::Long conv ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -352,7 +341,6 @@ void StdMeshers_NumberOfSegments_i::SetConversionMode(CORBA::Long conv ) //============================================================================= CORBA::Long StdMeshers_NumberOfSegments_i::ConversionMode() - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); int conv; diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.hxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.hxx index dc842e540..5f00a8fb9 100644 --- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.hxx +++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.hxx @@ -54,50 +54,38 @@ public: virtual ~StdMeshers_NumberOfSegments_i(); // Builds point distribution according to passed function - SMESH::double_array* BuildDistributionExpr( const char*, CORBA::Long, CORBA::Long ) - throw ( SALOME::SALOME_Exception ); - SMESH::double_array* BuildDistributionTab( const SMESH::double_array&, CORBA::Long, CORBA::Long ) - throw ( SALOME::SALOME_Exception ); + SMESH::double_array* BuildDistributionExpr( const char*, CORBA::Long, CORBA::Long ); + SMESH::double_array* BuildDistributionTab( const SMESH::double_array&, CORBA::Long, CORBA::Long ); // Set number of segments - void SetNumberOfSegments( CORBA::Long theSegmentsNumber ) - throw ( SALOME::SALOME_Exception ); + void SetNumberOfSegments( CORBA::Long theSegmentsNumber ); // Get number of segments CORBA::Long GetNumberOfSegments(); // Set distribution type - void SetDistrType(CORBA::Long typ) - throw ( SALOME::SALOME_Exception ); + void SetDistrType(CORBA::Long typ); // Get distribution type CORBA::Long GetDistrType(); // Set scalar factor - void SetScaleFactor( CORBA::Double theScaleFactor ) - throw ( SALOME::SALOME_Exception ); + void SetScaleFactor( CORBA::Double theScaleFactor ); // Get scalar factor - CORBA::Double GetScaleFactor() - throw ( SALOME::SALOME_Exception ); + CORBA::Double GetScaleFactor(); // Set table function for distribution DT_TabFunc - void SetTableFunction(const SMESH::double_array& table) - throw ( SALOME::SALOME_Exception ); + void SetTableFunction(const SMESH::double_array& table); // Get table function for distribution DT_TabFunc - SMESH::double_array* GetTableFunction() - throw ( SALOME::SALOME_Exception ); + SMESH::double_array* GetTableFunction(); // Set expression function for distribution DT_ExprFunc - void SetExpressionFunction(const char* expr) - throw ( SALOME::SALOME_Exception ); + void SetExpressionFunction(const char* expr); // Get expression function for distribution DT_ExprFunc - char* GetExpressionFunction() - throw ( SALOME::SALOME_Exception ); + char* GetExpressionFunction(); // Set the exponent mode on/off - void SetConversionMode( CORBA::Long conv ) - throw ( SALOME::SALOME_Exception ); + void SetConversionMode( CORBA::Long conv ); // Returns true if the exponent mode is set - CORBA::Long ConversionMode() - throw ( SALOME::SALOME_Exception ); + CORBA::Long ConversionMode(); // Get implementation ::StdMeshers_NumberOfSegments* GetImpl(); diff --git a/src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx b/src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx index eb1ffe8f3..07d58cb6e 100644 --- a/src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx @@ -63,7 +63,7 @@ StdMeshers_Prism_3D_i::~StdMeshers_Prism_3D_i() } //----------------------------------------------------------------------------- -bool StdMeshers_Prism_3D_i::IsApplicable( const TopoDS_Shape &S, bool toCheckAll, int algoDim ) +bool StdMeshers_Prism_3D_i::IsApplicable( const TopoDS_Shape &S, bool toCheckAll, int /*algoDim*/ ) { return ::StdMeshers_Prism_3D::IsApplicable( S, toCheckAll ); } diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx index a55e71098..fba7197de 100644 --- a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx @@ -74,7 +74,6 @@ StdMeshers_ProjectionSource1D_i::~StdMeshers_ProjectionSource1D_i() //============================================================================= void StdMeshers_ProjectionSource1D_i::SetSourceEdge(GEOM::GEOM_Object_ptr edge) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -98,7 +97,6 @@ void StdMeshers_ProjectionSource1D_i::SetSourceEdge(GEOM::GEOM_Object_ptr edge) void StdMeshers_ProjectionSource1D_i::SetVertexAssociation(GEOM::GEOM_Object_ptr sourceVertex, GEOM::GEOM_Object_ptr targetVertex) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -124,7 +122,6 @@ void StdMeshers_ProjectionSource1D_i::SetVertexAssociation(GEOM::GEOM_Object_ptr //============================================================================= void StdMeshers_ProjectionSource1D_i::SetSourceMesh(SMESH::SMESH_Mesh_ptr theMesh) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); @@ -306,7 +303,7 @@ void StdMeshers_ProjectionSource1D_i::LoadFrom( const char* theStream ) bool StdMeshers_ProjectionSource1D_i::getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const + std::vector< int > & /*subIDArray*/ ) const { for ( int i = 0; i < NB_SHAPES; ++i ) entryArray.push_back( myShapeEntries[ i ]); @@ -322,7 +319,7 @@ StdMeshers_ProjectionSource1D_i::getObjectsDependOn( std::vector< std::string > bool StdMeshers_ProjectionSource1D_i::setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) + std::vector< int > & /*subIDArray*/ ) { TopoDS_Shape shapes[ NB_SHAPES ]; for ( int i = 0; i < NB_SHAPES; ++i ) diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.hxx b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.hxx index 14fffd1d0..19e426be2 100644 --- a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.hxx @@ -59,8 +59,7 @@ public: /*! * Sets source or a group containing edges to take a mesh pattern from */ - void SetSourceEdge(GEOM::GEOM_Object_ptr edge) - throw ( SALOME::SALOME_Exception ); + void SetSourceEdge(GEOM::GEOM_Object_ptr edge); /*! * Returns the source edge or a group containing edges @@ -70,8 +69,7 @@ public: /*! * Sets source to take a mesh pattern from */ - void SetSourceMesh(SMESH::SMESH_Mesh_ptr mesh) - throw ( SALOME::SALOME_Exception ); + void SetSourceMesh(SMESH::SMESH_Mesh_ptr mesh); /*! * Return source mesh @@ -83,8 +81,7 @@ public: * This parameter is optional */ void SetVertexAssociation(GEOM::GEOM_Object_ptr sourceVertex, - GEOM::GEOM_Object_ptr targetVertex) - throw ( SALOME::SALOME_Exception ); + GEOM::GEOM_Object_ptr targetVertex); /*! * Returns the vertex associated with the target vertex. diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx b/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx index 2c09b8cad..4cfe2739c 100644 --- a/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx @@ -74,7 +74,6 @@ StdMeshers_ProjectionSource2D_i::~StdMeshers_ProjectionSource2D_i() //============================================================================= void StdMeshers_ProjectionSource2D_i::SetSourceFace(GEOM::GEOM_Object_ptr face) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -96,7 +95,6 @@ void StdMeshers_ProjectionSource2D_i::SetSourceFace(GEOM::GEOM_Object_ptr face) //============================================================================= void StdMeshers_ProjectionSource2D_i::SetSourceMesh(SMESH::SMESH_Mesh_ptr theMesh) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); @@ -147,7 +145,6 @@ void StdMeshers_ProjectionSource2D_i::SetVertexAssociation(GEOM::GEOM_Object_ptr GEOM::GEOM_Object_ptr sourceVertex2, GEOM::GEOM_Object_ptr targetVertex1, GEOM::GEOM_Object_ptr targetVertex2) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -319,7 +316,7 @@ void StdMeshers_ProjectionSource2D_i::LoadFrom( const char* theStream ) bool StdMeshers_ProjectionSource2D_i::getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const + std::vector< int > & /*subIDArray*/ ) const { for ( int i = 0; i < NB_SHAPES; ++i ) entryArray.push_back( myShapeEntries[ i ]); @@ -335,7 +332,7 @@ StdMeshers_ProjectionSource2D_i::getObjectsDependOn( std::vector< std::string > bool StdMeshers_ProjectionSource2D_i::setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) + std::vector< int > & /*subIDArray*/ ) { TopoDS_Shape shapes[ NB_SHAPES ]; for ( int i = 0; i < NB_SHAPES; ++i ) diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.hxx b/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.hxx index c9dad519b..7dcb90f74 100644 --- a/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.hxx @@ -59,8 +59,7 @@ public: /*! * Sets a source to take a mesh pattern from */ - void SetSourceFace(GEOM::GEOM_Object_ptr face) - throw ( SALOME::SALOME_Exception ); + void SetSourceFace(GEOM::GEOM_Object_ptr face); /*! * Returns the source face @@ -70,8 +69,7 @@ public: /*! * Sets source to take a mesh pattern from */ - void SetSourceMesh(SMESH::SMESH_Mesh_ptr mesh) - throw ( SALOME::SALOME_Exception ); + void SetSourceMesh(SMESH::SMESH_Mesh_ptr mesh); /*! * Return source mesh @@ -86,8 +84,7 @@ public: void SetVertexAssociation(GEOM::GEOM_Object_ptr sourceVertex1, GEOM::GEOM_Object_ptr sourceVertex2, GEOM::GEOM_Object_ptr targetVertex1, - GEOM::GEOM_Object_ptr targetVertex2) - throw ( SALOME::SALOME_Exception ); + GEOM::GEOM_Object_ptr targetVertex2); /*! * Returns the -th source vertex associated with the -th target vertex. diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.cxx b/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.cxx index e5eae778b..112330e6b 100644 --- a/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.cxx @@ -74,7 +74,6 @@ StdMeshers_ProjectionSource3D_i::~StdMeshers_ProjectionSource3D_i() //============================================================================= void StdMeshers_ProjectionSource3D_i::SetSource3DShape(GEOM::GEOM_Object_ptr shape) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -97,7 +96,6 @@ void StdMeshers_ProjectionSource3D_i::SetSource3DShape(GEOM::GEOM_Object_ptr sha //============================================================================= void StdMeshers_ProjectionSource3D_i::SetSourceMesh(SMESH::SMESH_Mesh_ptr theMesh) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); @@ -148,7 +146,6 @@ void StdMeshers_ProjectionSource3D_i::SetVertexAssociation(GEOM::GEOM_Object_ptr GEOM::GEOM_Object_ptr sourceVertex2, GEOM::GEOM_Object_ptr targetVertex1, GEOM::GEOM_Object_ptr targetVertex2) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -320,7 +317,7 @@ void StdMeshers_ProjectionSource3D_i::LoadFrom( const char* theStream ) bool StdMeshers_ProjectionSource3D_i::getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const + std::vector< int > & /*subIDArray*/ ) const { for ( int i = 0; i < NB_SHAPES; ++i ) entryArray.push_back( myShapeEntries[ i ]); @@ -336,7 +333,7 @@ StdMeshers_ProjectionSource3D_i::getObjectsDependOn( std::vector< std::string > bool StdMeshers_ProjectionSource3D_i::setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) + std::vector< int > & /*subIDArray*/ ) { TopoDS_Shape shapes[ NB_SHAPES ]; for ( int i = 0; i < NB_SHAPES; ++i ) diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.hxx b/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.hxx index 44b7303e1..4f3b3c9c5 100644 --- a/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.hxx @@ -60,8 +60,7 @@ public: /*! * Sets a source to take a mesh pattern from */ - void SetSource3DShape(GEOM::GEOM_Object_ptr shape) - throw ( SALOME::SALOME_Exception ); + void SetSource3DShape(GEOM::GEOM_Object_ptr shape); /*! * Returns the source shape @@ -71,8 +70,7 @@ public: /*! * Sets source to take a mesh pattern from */ - void SetSourceMesh(SMESH::SMESH_Mesh_ptr mesh) - throw ( SALOME::SALOME_Exception ); + void SetSourceMesh(SMESH::SMESH_Mesh_ptr mesh); /*! * Return source mesh @@ -87,8 +85,7 @@ public: void SetVertexAssociation(GEOM::GEOM_Object_ptr sourceVertex1, GEOM::GEOM_Object_ptr sourceVertex2, GEOM::GEOM_Object_ptr targetVertex1, - GEOM::GEOM_Object_ptr targetVertex2) - throw ( SALOME::SALOME_Exception ); + GEOM::GEOM_Object_ptr targetVertex2); /*! * Returns the -th source vertex associated with the -th target vertex. diff --git a/src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.cxx b/src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.cxx index 85ef8e471..5a9b0cb97 100644 --- a/src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.cxx @@ -67,7 +67,7 @@ StdMeshers_Projection_3D_i::~StdMeshers_Projection_3D_i() */ //================================================================================ -bool StdMeshers_Projection_3D_i::IsApplicable( const TopoDS_Shape &S, bool toCheckAll, int algoDim ) +bool StdMeshers_Projection_3D_i::IsApplicable( const TopoDS_Shape &S, bool toCheckAll, int /*algoDim*/ ) { return ::StdMeshers_Projection_3D::IsApplicable( S, toCheckAll ); } diff --git a/src/StdMeshers_I/StdMeshers_Propagation_i.hxx b/src/StdMeshers_I/StdMeshers_Propagation_i.hxx index 91e491a28..3cb292d4e 100644 --- a/src/StdMeshers_I/StdMeshers_Propagation_i.hxx +++ b/src/StdMeshers_I/StdMeshers_Propagation_i.hxx @@ -54,10 +54,10 @@ public: CORBA::Boolean IsDimSupported( SMESH::Dimension type ); // Methods for copying mesh definition to other geometry - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return false; } - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return false; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; // ====================================================== @@ -77,10 +77,10 @@ public: CORBA::Boolean IsDimSupported( SMESH::Dimension type ); // Methods for copying mesh definition to other geometry - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return false; } - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return false; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; #endif diff --git a/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx b/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx index 35113ee72..45f26349b 100644 --- a/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx +++ b/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx @@ -207,7 +207,6 @@ StdMeshers::QuadType StdMeshers_QuadrangleParams_i::GetQuadType() void StdMeshers_QuadrangleParams_i::SetEnforcedNodes(const GEOM::ListOfGO& theVertices, const SMESH::nodes_array& thePoints) - throw ( SALOME::SALOME_Exception ) { try { std::vector< TopoDS_Shape > shapes; diff --git a/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.hxx b/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.hxx index 8cb611f55..2a2c63dba 100644 --- a/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.hxx +++ b/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.hxx @@ -65,7 +65,7 @@ public: // Set positions of enforced nodes void SetEnforcedNodes(const GEOM::ListOfGO& vertices, - const SMESH::nodes_array& points) throw ( SALOME::SALOME_Exception ); + const SMESH::nodes_array& points); // Returns positions of enforced nodes void GetEnforcedNodes(GEOM::ListOfGO_out vertices, SMESH::nodes_array_out points); diff --git a/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.hxx b/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.hxx index 5d0d34755..66e1a2332 100644 --- a/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.hxx +++ b/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.hxx @@ -60,10 +60,10 @@ public: CORBA::Boolean IsDimSupported( SMESH::Dimension type ); // Methods for copying mesh definition to other geometry - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return false; } - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return false; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; #endif diff --git a/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx b/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx index b82f7faeb..cd6b9b66c 100644 --- a/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx @@ -89,7 +89,7 @@ StdMeshers_Quadrangle_2D_i::~StdMeshers_Quadrangle_2D_i() */ //============================================================================= -bool StdMeshers_Quadrangle_2D_i::IsApplicable( const TopoDS_Shape &S, bool toCheckAll, int algoDim ) +bool StdMeshers_Quadrangle_2D_i::IsApplicable( const TopoDS_Shape &S, bool toCheckAll, int /*algoDim*/ ) { return ::StdMeshers_Quadrangle_2D::IsApplicable( S, toCheckAll ); } @@ -134,7 +134,7 @@ StdMeshers_QuadFromMedialAxis_1D2D_i::~StdMeshers_QuadFromMedialAxis_1D2D_i() //================================================================================ bool StdMeshers_QuadFromMedialAxis_1D2D_i::IsApplicable( const TopoDS_Shape &S, - bool toCheckAll, int algoDim ) + bool toCheckAll, int /*algoDim*/ ) { return ::StdMeshers_QuadFromMedialAxis_1D2D::IsApplicable( S, toCheckAll ); } diff --git a/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.hxx b/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.hxx index 277024696..84d7c4a4a 100644 --- a/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.hxx +++ b/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.hxx @@ -61,10 +61,10 @@ public: CORBA::Boolean IsDimSupported( SMESH::Dimension type ); // Methods for copying mesh definition to other geometry - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return false; } - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return false; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; #endif diff --git a/src/StdMeshers_I/StdMeshers_RadialQuadrangle_1D2D_i.cxx b/src/StdMeshers_I/StdMeshers_RadialQuadrangle_1D2D_i.cxx index 3533a79cf..955dff0f6 100644 --- a/src/StdMeshers_I/StdMeshers_RadialQuadrangle_1D2D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_RadialQuadrangle_1D2D_i.cxx @@ -63,7 +63,7 @@ StdMeshers_RadialQuadrangle_1D2D_i::~StdMeshers_RadialQuadrangle_1D2D_i() //----------------------------------------------------------------------------- -bool StdMeshers_RadialQuadrangle_1D2D_i::IsApplicable( const TopoDS_Shape &S, bool toCheckAll, int algoDim ) +bool StdMeshers_RadialQuadrangle_1D2D_i::IsApplicable( const TopoDS_Shape &S, bool toCheckAll, int /*algoDim*/ ) { return ::StdMeshers_RadialQuadrangle_1D2D::IsApplicable( S, toCheckAll ); } diff --git a/src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.cxx b/src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.cxx index df293dde3..6d346c39a 100644 --- a/src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.cxx +++ b/src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.cxx @@ -74,7 +74,6 @@ StdMeshers_SegmentLengthAroundVertex_i::~StdMeshers_SegmentLengthAroundVertex_i( //============================================================================= void StdMeshers_SegmentLengthAroundVertex_i::SetLength( CORBA::Double theLength ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { diff --git a/src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.hxx b/src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.hxx index b44d75f36..3be789de4 100644 --- a/src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.hxx +++ b/src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.hxx @@ -51,8 +51,7 @@ public: virtual ~StdMeshers_SegmentLengthAroundVertex_i(); // Set length - void SetLength( CORBA::Double theLength ) - throw ( SALOME::SALOME_Exception ); + void SetLength( CORBA::Double theLength ); // Get length CORBA::Double GetLength(); @@ -67,12 +66,12 @@ public: // Methods for copying mesh definition to other geometry // Return geometry this hypothesis depends on. Return false if there is no geometry parameter - virtual bool getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } protected: virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const; }; diff --git a/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx b/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx index f1d554faa..6f4af0dbe 100644 --- a/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx +++ b/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx @@ -78,7 +78,6 @@ StdMeshers_StartEndLength_i::~StdMeshers_StartEndLength_i() void StdMeshers_StartEndLength_i::SetLength(CORBA::Double theLength, CORBA::Boolean theIsStart ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -102,7 +101,6 @@ void StdMeshers_StartEndLength_i::SetLength(CORBA::Double theLength, //============================================================================= void StdMeshers_StartEndLength_i::SetStartLength( CORBA::Double length) - throw (SALOME::SALOME_Exception) { SetLength( length, true ); } @@ -114,7 +112,6 @@ void StdMeshers_StartEndLength_i::SetStartLength( CORBA::Double length) //============================================================================= void StdMeshers_StartEndLength_i::SetEndLength( CORBA::Double length) - throw (SALOME::SALOME_Exception) { SetLength( length, false ); } diff --git a/src/StdMeshers_I/StdMeshers_StartEndLength_i.hxx b/src/StdMeshers_I/StdMeshers_StartEndLength_i.hxx index 5777aeeee..784eebe1c 100644 --- a/src/StdMeshers_I/StdMeshers_StartEndLength_i.hxx +++ b/src/StdMeshers_I/StdMeshers_StartEndLength_i.hxx @@ -56,14 +56,13 @@ public: // Set length // * OBSOLETE *. Avoid such a way of interface design - void SetLength( CORBA::Double theLength, CORBA::Boolean theIsStart ) - throw ( SALOME::SALOME_Exception ); + void SetLength( CORBA::Double theLength, CORBA::Boolean theIsStart ); // Sets parameter value - void SetStartLength( CORBA::Double length) throw (SALOME::SALOME_Exception); + void SetStartLength( CORBA::Double length); // Sets parameter value - void SetEndLength( CORBA::Double length) throw (SALOME::SALOME_Exception); + void SetEndLength( CORBA::Double length); // Get length CORBA::Double GetLength(CORBA::Boolean theIsStart); diff --git a/src/StdMeshers_I/StdMeshers_ViscousLayers2D_i.cxx b/src/StdMeshers_I/StdMeshers_ViscousLayers2D_i.cxx index e9a3be7bb..eaeb970ab 100644 --- a/src/StdMeshers_I/StdMeshers_ViscousLayers2D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_ViscousLayers2D_i.cxx @@ -75,7 +75,6 @@ StdMeshers_ViscousLayers2D_i::~StdMeshers_ViscousLayers2D_i() void StdMeshers_ViscousLayers2D_i::SetEdges(const ::SMESH::long_array& edgeIDs, CORBA::Boolean toIgnore) - throw ( SALOME::SALOME_Exception ) { vector ids( edgeIDs.length() ); for ( unsigned i = 0; i < ids.size(); ++i ) @@ -94,7 +93,6 @@ void StdMeshers_ViscousLayers2D_i::SetEdges(const ::SMESH::long_array& edgeIDs, //================================================================================ void StdMeshers_ViscousLayers2D_i::SetIgnoreEdges(const ::SMESH::long_array& edgeIDs) - throw ( SALOME::SALOME_Exception ) { SMESH::TPythonDump pyDump; this->SetEdges( edgeIDs, true ); @@ -148,7 +146,6 @@ CORBA::Boolean StdMeshers_ViscousLayers2D_i::GetIsToIgnoreEdges() //================================================================================ void StdMeshers_ViscousLayers2D_i::SetTotalThickness(::CORBA::Double thickness) -throw ( SALOME::SALOME_Exception ) { if ( thickness < 1e-100 ) THROW_SALOME_CORBA_EXCEPTION( "Invalid thickness", SALOME::BAD_PARAM ); @@ -175,7 +172,6 @@ throw ( SALOME::SALOME_Exception ) //================================================================================ void StdMeshers_ViscousLayers2D_i::SetNumberLayers(::CORBA::Short nb) -throw ( SALOME::SALOME_Exception ) { if ( nb < 1 ) THROW_SALOME_CORBA_EXCEPTION( "Invalid number of layers", SALOME::BAD_PARAM ); @@ -202,7 +198,6 @@ throw ( SALOME::SALOME_Exception ) //================================================================================ void StdMeshers_ViscousLayers2D_i::SetStretchFactor(::CORBA::Double factor) -throw ( SALOME::SALOME_Exception ) { if ( factor < 1 ) THROW_SALOME_CORBA_EXCEPTION( "Invalid stretch factor, it must be >= 1.0", SALOME::BAD_PARAM ); @@ -294,7 +289,7 @@ void StdMeshers_ViscousLayers2D_i::UpdateAsMeshesRestored() //================================================================================ bool -StdMeshers_ViscousLayers2D_i::getObjectsDependOn( std::vector< std::string > & entryArray, +StdMeshers_ViscousLayers2D_i::getObjectsDependOn( std::vector< std::string > & /*entryArray*/, std::vector< int > & subIDArray ) const { const ::StdMeshers_ViscousLayers2D* impl = @@ -312,7 +307,7 @@ StdMeshers_ViscousLayers2D_i::getObjectsDependOn( std::vector< std::string > & e //================================================================================ bool -StdMeshers_ViscousLayers2D_i::setObjectsDependOn( std::vector< std::string > & entryArray, +StdMeshers_ViscousLayers2D_i::setObjectsDependOn( std::vector< std::string > & /*entryArray*/, std::vector< int > & subIDArray ) { std::vector< int > newIDs; diff --git a/src/StdMeshers_I/StdMeshers_ViscousLayers2D_i.hxx b/src/StdMeshers_I/StdMeshers_ViscousLayers2D_i.hxx index 5913ce6bc..b7d5a2afe 100644 --- a/src/StdMeshers_I/StdMeshers_ViscousLayers2D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_ViscousLayers2D_i.hxx @@ -47,21 +47,21 @@ class STDMESHERS_I_EXPORT StdMeshers_ViscousLayers2D_i: // Destructor virtual ~StdMeshers_ViscousLayers2D_i(); - void SetIgnoreEdges(const SMESH::long_array& edgeIDs) throw ( SALOME::SALOME_Exception ); + void SetIgnoreEdges(const SMESH::long_array& edgeIDs); SMESH::long_array* GetIgnoreEdges(); void SetEdges(const SMESH::long_array& edgeIDs, - CORBA::Boolean toIgnore) throw (SALOME::SALOME_Exception); + CORBA::Boolean toIgnore); SMESH::long_array* GetEdges(); CORBA::Boolean GetIsToIgnoreEdges(); - void SetTotalThickness(::CORBA::Double thickness) throw ( SALOME::SALOME_Exception ); + void SetTotalThickness(::CORBA::Double thickness); ::CORBA::Double GetTotalThickness(); - void SetNumberLayers(::CORBA::Short nb) throw ( SALOME::SALOME_Exception ); + void SetNumberLayers(::CORBA::Short nb); ::CORBA::Short GetNumberLayers(); - void SetStretchFactor(::CORBA::Double factor) throw ( SALOME::SALOME_Exception ); + void SetStretchFactor(::CORBA::Double factor); ::CORBA::Double GetStretchFactor(); void SetGroupName(const char* name); diff --git a/src/StdMeshers_I/StdMeshers_ViscousLayers_i.cxx b/src/StdMeshers_I/StdMeshers_ViscousLayers_i.cxx index d2889254c..7f967dcb2 100644 --- a/src/StdMeshers_I/StdMeshers_ViscousLayers_i.cxx +++ b/src/StdMeshers_I/StdMeshers_ViscousLayers_i.cxx @@ -76,7 +76,6 @@ StdMeshers_ViscousLayers_i::~StdMeshers_ViscousLayers_i() void StdMeshers_ViscousLayers_i::SetFaces(const ::SMESH::long_array& faceIDs, CORBA::Boolean toIgnore) - throw ( SALOME::SALOME_Exception ) { vector ids( faceIDs.length() ); for ( unsigned i = 0; i < ids.size(); ++i ) @@ -135,7 +134,6 @@ CORBA::Boolean StdMeshers_ViscousLayers_i::GetIsToIgnoreFaces() //================================================================================ void StdMeshers_ViscousLayers_i::SetIgnoreFaces(const ::SMESH::long_array& faceIDs) -throw ( SALOME::SALOME_Exception ) { vector ids( faceIDs.length() ); for ( unsigned i = 0; i < ids.size(); ++i ) @@ -152,7 +150,6 @@ throw ( SALOME::SALOME_Exception ) //================================================================================ void StdMeshers_ViscousLayers_i::SetTotalThickness(::CORBA::Double thickness) -throw ( SALOME::SALOME_Exception ) { if ( thickness < 1e-100 ) THROW_SALOME_CORBA_EXCEPTION( "Invalid thickness", SALOME::BAD_PARAM ); @@ -179,7 +176,6 @@ throw ( SALOME::SALOME_Exception ) //================================================================================ void StdMeshers_ViscousLayers_i::SetNumberLayers(::CORBA::Short nb) -throw ( SALOME::SALOME_Exception ) { if ( nb < 1 ) THROW_SALOME_CORBA_EXCEPTION( "Invalid number of layers", SALOME::BAD_PARAM ); @@ -206,7 +202,6 @@ throw ( SALOME::SALOME_Exception ) //================================================================================ void StdMeshers_ViscousLayers_i::SetStretchFactor(::CORBA::Double factor) -throw ( SALOME::SALOME_Exception ) { if ( factor < 1 ) THROW_SALOME_CORBA_EXCEPTION( "Invalid stretch factor, it must be >= 1.0", SALOME::BAD_PARAM ); @@ -330,7 +325,7 @@ std::string StdMeshers_ViscousLayers_i::getMethodOfParameter(const int paramInde //================================================================================ bool -StdMeshers_ViscousLayers_i::getObjectsDependOn( std::vector< std::string > & entryArray, +StdMeshers_ViscousLayers_i::getObjectsDependOn( std::vector< std::string > & /*entryArray*/, std::vector< int > & subIDArray ) const { const ::StdMeshers_ViscousLayers* impl = @@ -348,7 +343,7 @@ StdMeshers_ViscousLayers_i::getObjectsDependOn( std::vector< std::string > & ent //================================================================================ bool -StdMeshers_ViscousLayers_i::setObjectsDependOn( std::vector< std::string > & entryArray, +StdMeshers_ViscousLayers_i::setObjectsDependOn( std::vector< std::string > & /*entryArray*/, std::vector< int > & subIDArray ) { std::vector< int > newIDs; diff --git a/src/StdMeshers_I/StdMeshers_ViscousLayers_i.hxx b/src/StdMeshers_I/StdMeshers_ViscousLayers_i.hxx index 298358e07..0b9affd41 100644 --- a/src/StdMeshers_I/StdMeshers_ViscousLayers_i.hxx +++ b/src/StdMeshers_I/StdMeshers_ViscousLayers_i.hxx @@ -47,21 +47,21 @@ class STDMESHERS_I_EXPORT StdMeshers_ViscousLayers_i: // Destructor virtual ~StdMeshers_ViscousLayers_i(); - void SetIgnoreFaces(const ::SMESH::long_array& faceIDs) throw ( SALOME::SALOME_Exception ); + void SetIgnoreFaces(const ::SMESH::long_array& faceIDs); SMESH::long_array* GetIgnoreFaces(); void SetFaces(const SMESH::long_array& faceIDs, - CORBA::Boolean toIgnore) throw (SALOME::SALOME_Exception); + CORBA::Boolean toIgnore); SMESH::long_array* GetFaces(); CORBA::Boolean GetIsToIgnoreFaces(); - void SetTotalThickness(::CORBA::Double thickness) throw ( SALOME::SALOME_Exception ); + void SetTotalThickness(::CORBA::Double thickness); ::CORBA::Double GetTotalThickness(); - void SetNumberLayers(::CORBA::Short nb) throw ( SALOME::SALOME_Exception ); + void SetNumberLayers(::CORBA::Short nb); ::CORBA::Short GetNumberLayers(); - void SetStretchFactor(::CORBA::Double factor) throw ( SALOME::SALOME_Exception ); + void SetStretchFactor(::CORBA::Double factor); ::CORBA::Double GetStretchFactor(); void SetMethod( ::StdMeshers::VLExtrusionMethod how ); diff --git a/src/StdMeshers_I/StdMeshers_i.cxx b/src/StdMeshers_I/StdMeshers_i.cxx index 9038d2f58..b9782affa 100644 --- a/src/StdMeshers_I/StdMeshers_i.cxx +++ b/src/StdMeshers_I/StdMeshers_i.cxx @@ -85,12 +85,12 @@ namespace SMESH { class ApplicableToAny { public: - static bool IsApplicable( const TopoDS_Shape &S, bool toCheckAll, int algoDim ) + static bool IsApplicable( const TopoDS_Shape &S, bool /*toCheckAll*/, int algoDim ) { return GenericHypothesisCreator_i::IsShapeOfDim( S, algoDim ); } }; -}; +} template class StdHypothesisCreator_i : public HypothesisCreator_i< T > @@ -256,7 +256,6 @@ STDMESHERS_I_EXPORT aCreator = new StdHypothesisCreator_i; else if (strcmp(aHypName, "PolyhedronPerSolid_3D") == 0) aCreator = new StdHypothesisCreator_i; - else ; return aCreator; } diff --git a/src/Tools/MeshCut/MeshCut_Maillage.cxx b/src/Tools/MeshCut/MeshCut_Maillage.cxx index 49655079f..e71a29677 100644 --- a/src/Tools/MeshCut/MeshCut_Maillage.cxx +++ b/src/Tools/MeshCut/MeshCut_Maillage.cxx @@ -78,7 +78,7 @@ void Maillage::afficheMailles(TYPE_MAILLE tm) } } -void Maillage::listeMaillesType(TYPE_MAILLE tm) +void Maillage::listeMaillesType(TYPE_MAILLE /*tm*/) { cout << "La fonction \"Restitution des mailles par type\" est obsolète " << endl; @@ -854,7 +854,7 @@ void Maillage::inputMED(std::string fichierMED) } void Maillage::acquisitionTYPE_inputMED(TYPE_MAILLE TYPE, int nTYPE, med_idt fid, char maa[MED_NAME_SIZE + 1], - med_int mdim) + med_int /*mdim*/) { // int taille, numeromaille, numeroFamille; @@ -1595,7 +1595,7 @@ TYPE_MAILLE Maillage::TYPE(int nglobal) return resultat; } -int Maillage::NLOCAL(int nglobal, TYPE_MAILLE tm) +int Maillage::NLOCAL(int nglobal, TYPE_MAILLE /*tm*/) { // Attention, les num. globaux commencent à 1, les num. locaux à 0 int nPOI1 = EFFECTIFS_TYPES[POI1]; diff --git a/src/Tools/MeshCut/MeshCut_Maillage.hxx b/src/Tools/MeshCut/MeshCut_Maillage.hxx index 6e9e8390d..a383db29b 100644 --- a/src/Tools/MeshCut/MeshCut_Maillage.hxx +++ b/src/Tools/MeshCut/MeshCut_Maillage.hxx @@ -125,8 +125,7 @@ namespace MESHCUT void eliminationMailles(TYPE_MAILLE typeMaille, std::vector listeMaillesSuppr); // acquisitionTYPE_inputMED appelée par inputMED - void - acquisitionTYPE_inputMED(TYPE_MAILLE TYPE, int nTYPE, med_idt fid, char maa[MED_NAME_SIZE + 1], med_int mdim); + void acquisitionTYPE_inputMED(TYPE_MAILLE TYPE, int nTYPE, med_idt fid, char maa[MED_NAME_SIZE + 1], med_int mdim); // void infoChamps(std::string type, med_entity_type MEM, med_geometry_type MGE, med_idt fid, char *maa, // char *nomChamp, med_field_type typeChamp, med_int nCompChamp, std::map REFGAUSS); diff --git a/src/Tools/MeshCut/MeshCut_Utils.cxx b/src/Tools/MeshCut/MeshCut_Utils.cxx index 0f28f02c6..074381549 100644 --- a/src/Tools/MeshCut/MeshCut_Utils.cxx +++ b/src/Tools/MeshCut/MeshCut_Utils.cxx @@ -437,7 +437,7 @@ int MESHCUT::codeGMSH(std::string type) std::string MESHCUT::floatEnsight(float x) { - char buf[12]; + char buf[20]; string s; if (x < 0.0) sprintf(buf, "%1.5E", x); diff --git a/src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx b/src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx index 71e4d5021..5eee6858e 100644 --- a/src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx +++ b/src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx @@ -673,6 +673,7 @@ std::vector * MeshJobManager_i::_getResourceNames() { LOG("resource["<GetResourceDefinition(aResourceName); LOG("protocol["<protocol); + (void)resourceDefinition; // unused in release mode } }