From b17ae2a922a8b8980657d2cabd5bfccab560f501 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 8 Oct 2016 18:23:04 +0200 Subject: [PATCH] fix warnings in smesh --- src/3rdParty/salomesmesh/inc/SMDS_BallElement.hxx | 2 +- src/3rdParty/salomesmesh/inc/SMDS_LinearEdge.hxx | 2 +- src/3rdParty/salomesmesh/inc/SMDS_MeshCell.hxx | 2 +- src/3rdParty/salomesmesh/inc/SMESH_OctreeNode.hxx | 2 +- src/3rdParty/salomesmesh/inc/utilities.h | 4 ++-- src/3rdParty/salomesmesh/src/SMESH/MED_V2_2_Wrapper.cpp | 2 +- src/3rdParty/salomesmesh/src/SMESH/SMESH_Gen.cpp | 4 +++- src/3rdParty/salomesmesh/src/SMESH/SMESH_OctreeNode.cpp | 2 +- src/3rdParty/salomesmesh/src/SMESH/libmesh.c | 2 +- .../salomesmesh/src/StdMeshers/StdMeshers_Cartesian_3D.cpp | 2 +- .../salomesmesh/src/StdMeshers/StdMeshers_Projection_2D.cpp | 4 +++- .../src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cpp | 2 +- .../salomesmesh/src/StdMeshers/StdMeshers_ViscousLayers.cpp | 4 +++- 13 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/3rdParty/salomesmesh/inc/SMDS_BallElement.hxx b/src/3rdParty/salomesmesh/inc/SMDS_BallElement.hxx index d54b20712..96359d34c 100644 --- a/src/3rdParty/salomesmesh/inc/SMDS_BallElement.hxx +++ b/src/3rdParty/salomesmesh/inc/SMDS_BallElement.hxx @@ -41,7 +41,7 @@ class SMDS_EXPORT SMDS_BallElement: public SMDS_MeshCell bool ChangeNode (const SMDS_MeshNode * node); virtual bool ChangeNodes(const SMDS_MeshNode* nodes[], - const int nbNodes) { return ChangeNode( nodes[0] ); } + const int /*nbNodes*/) { return ChangeNode( nodes[0] ); } virtual void Print (std::ostream & OS) const; virtual SMDSAbs_ElementType GetType() const { return SMDSAbs_Ball; } diff --git a/src/3rdParty/salomesmesh/inc/SMDS_LinearEdge.hxx b/src/3rdParty/salomesmesh/inc/SMDS_LinearEdge.hxx index 38a29e7dd..8e30f39cf 100644 --- a/src/3rdParty/salomesmesh/inc/SMDS_LinearEdge.hxx +++ b/src/3rdParty/salomesmesh/inc/SMDS_LinearEdge.hxx @@ -42,7 +42,7 @@ public: { return SMDSEntity_Edge; } - virtual bool ChangeNodes(const SMDS_MeshNode* nodes[], const int nbNodes) + virtual bool ChangeNodes(const SMDS_MeshNode* /*nodes*/[], const int /*nbNodes*/) { return false; } diff --git a/src/3rdParty/salomesmesh/inc/SMDS_MeshCell.hxx b/src/3rdParty/salomesmesh/inc/SMDS_MeshCell.hxx index d56f7b5de..ce154aa18 100644 --- a/src/3rdParty/salomesmesh/inc/SMDS_MeshCell.hxx +++ b/src/3rdParty/salomesmesh/inc/SMDS_MeshCell.hxx @@ -33,7 +33,7 @@ public: virtual ~SMDS_MeshCell(); virtual bool ChangeNodes(const SMDS_MeshNode* nodes[], const int nbNodes)= 0; - virtual bool vtkOrder(const SMDS_MeshNode* nodes[], const int nbNodes) {return true; } + virtual bool vtkOrder(const SMDS_MeshNode* /*nodes*/[], const int /*nbNodes*/) {return true; } static VTKCellType toVtkType (SMDSAbs_EntityType vtkType); static SMDSAbs_EntityType toSmdsType(VTKCellType vtkType); diff --git a/src/3rdParty/salomesmesh/inc/SMESH_OctreeNode.hxx b/src/3rdParty/salomesmesh/inc/SMESH_OctreeNode.hxx index 2cd22a3c5..7da649deb 100644 --- a/src/3rdParty/salomesmesh/inc/SMESH_OctreeNode.hxx +++ b/src/3rdParty/salomesmesh/inc/SMESH_OctreeNode.hxx @@ -62,7 +62,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 NodesAround(const SMDS_MeshNode * node, diff --git a/src/3rdParty/salomesmesh/inc/utilities.h b/src/3rdParty/salomesmesh/inc/utilities.h index 2084c6ad0..7bca9e6e5 100644 --- a/src/3rdParty/salomesmesh/inc/utilities.h +++ b/src/3rdParty/salomesmesh/inc/utilities.h @@ -134,8 +134,8 @@ DEF_MSG_BUFFER << os.str() << std::endl; #else /* ifdef _DEBUG_*/ #define INFOS_COMPILATION -#define MESSAGE(msg) -#define SCRUTE(var) +#define MESSAGE(msg) {} +#define SCRUTE(var) {} #define REPERE #define BEGIN_OF(msg) #define END_OF(msg) diff --git a/src/3rdParty/salomesmesh/src/SMESH/MED_V2_2_Wrapper.cpp b/src/3rdParty/salomesmesh/src/SMESH/MED_V2_2_Wrapper.cpp index 238d97b57..144c6b542 100644 --- a/src/3rdParty/salomesmesh/src/SMESH/MED_V2_2_Wrapper.cpp +++ b/src/3rdParty/salomesmesh/src/SMESH/MED_V2_2_Wrapper.cpp @@ -1749,7 +1749,7 @@ namespace MED // write node ids SetCellInfo(theInfo,theMode,theErr); - if ( theErr && theErr < 0 ) + if ( theErr && *theErr < 0 ) return; // write diameter diff --git a/src/3rdParty/salomesmesh/src/SMESH/SMESH_Gen.cpp b/src/3rdParty/salomesmesh/src/SMESH/SMESH_Gen.cpp index 5780f95f1..c6ea4c0fa 100644 --- a/src/3rdParty/salomesmesh/src/SMESH/SMESH_Gen.cpp +++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_Gen.cpp @@ -1014,12 +1014,14 @@ std::vector< std::string > SMESH_Gen::GetPluginXMLPaths() } // get a separator from rootDir - for ( pos = strlen( rootDir )-1; pos >= 0 && sep.empty(); --pos ) + for ( pos = strlen( rootDir )-1; pos > 0 && sep.empty(); --pos ) + { if ( rootDir[pos] == '/' || rootDir[pos] == '\\' ) { sep = rootDir[pos]; break; } + } #ifdef WIN32 if (sep.empty() ) sep = "\\"; #else diff --git a/src/3rdParty/salomesmesh/src/SMESH/SMESH_OctreeNode.cpp b/src/3rdParty/salomesmesh/src/SMESH/SMESH_OctreeNode.cpp index e55128eb8..98d7bf499 100644 --- a/src/3rdParty/salomesmesh/src/SMESH/SMESH_OctreeNode.cpp +++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_OctreeNode.cpp @@ -117,7 +117,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/3rdParty/salomesmesh/src/SMESH/libmesh.c b/src/3rdParty/salomesmesh/src/SMESH/libmesh.c index 288e7a8ea..2a359c6b0 100644 --- a/src/3rdParty/salomesmesh/src/SMESH/libmesh.c +++ b/src/3rdParty/salomesmesh/src/SMESH/libmesh.c @@ -1157,7 +1157,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/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Cartesian_3D.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Cartesian_3D.cpp index 519b0acda..e7e2d5ca4 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Cartesian_3D.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Cartesian_3D.cpp @@ -1650,7 +1650,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 ); diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Projection_2D.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Projection_2D.cpp index 62d718617..4e878f85a 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Projection_2D.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Projection_2D.cpp @@ -1479,7 +1479,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/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cpp index a9b924724..4c7aee91d 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cpp @@ -1582,7 +1582,7 @@ namespace int nbNodes2 = meshDS->MeshElements(edgeIDs[ edgeIDs2[i]] )->NbNodes(); if ( nbNodes1 != nbNodes2 ) return false; - if (( i-1 >= 0 ) && + if (( i >= 1 ) && ( edgeIDs1[i-1] == edgeIDs1[i] || edgeIDs2[i-1] == edgeIDs2[i] )) return false; diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_ViscousLayers.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_ViscousLayers.cpp index 49b55c200..291dc9195 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_ViscousLayers.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_ViscousLayers.cpp @@ -1404,7 +1404,7 @@ namespace VISCOUS_3D #define dumpMoveComm(n,txt) #define dumpCmd(txt) #define dumpFunctionEnd() -#define dumpChangeNodes(f) +#define dumpChangeNodes(f) {} #define debugMsg( txt ) {} #endif } @@ -6645,8 +6645,10 @@ bool _ViscousBuilder::shrink() dumpFunction(SMESH_Comment("beforeShrinkFace")<first); // debug SMDS_ElemIteratorPtr fIt = smDS->GetElements(); while ( fIt->more() ) + { if ( const SMDS_MeshElement* f = fIt->next() ) dumpChangeNodes( f ); + } dumpFunctionEnd(); // Replace source nodes by target nodes in mesh faces to shrink