From a8634f09fc838b2e1391708593f0e712548a22b2 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Sat, 8 Aug 2015 01:24:37 +0300 Subject: [PATCH] 3rdParty/salomesmesh: suppress several small warnings Warnings was about a struct declared as type and as usual added several additional brackets. --- src/3rdParty/salomesmesh/inc/SMESH_subMesh.hxx | 2 +- .../salomesmesh/inc/SMESH_subMeshEventListener.hxx | 2 +- .../src/NETGENPlugin/NETGENPlugin_Mesher.cpp | 12 +++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/3rdParty/salomesmesh/inc/SMESH_subMesh.hxx b/src/3rdParty/salomesmesh/inc/SMESH_subMesh.hxx index ed9b0d72391c..823593844b1b 100644 --- a/src/3rdParty/salomesmesh/inc/SMESH_subMesh.hxx +++ b/src/3rdParty/salomesmesh/inc/SMESH_subMesh.hxx @@ -47,7 +47,7 @@ class SMESH_Hypothesis; class SMESH_Algo; class SMESH_Gen; class SMESH_subMeshEventListener; -class SMESH_subMeshEventListenerData; +struct SMESH_subMeshEventListenerData; class SMESH_subMesh; typedef SMESH_subMeshEventListener EventListener; diff --git a/src/3rdParty/salomesmesh/inc/SMESH_subMeshEventListener.hxx b/src/3rdParty/salomesmesh/inc/SMESH_subMeshEventListener.hxx index 4673452fc347..6396973af5d2 100644 --- a/src/3rdParty/salomesmesh/inc/SMESH_subMeshEventListener.hxx +++ b/src/3rdParty/salomesmesh/inc/SMESH_subMeshEventListener.hxx @@ -33,7 +33,7 @@ class SMESH_subMesh; class SMESH_Hypothesis; -struct SMESH_subMeshEventListenerData; +struct SMESH_subMeshEventListenerData; // ------------------------------------------------------------------ /*! diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp index 1dd087129ca3..fdbd6d5d30dd 100644 --- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp +++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp @@ -187,8 +187,8 @@ int HashCode(const Link& aLink, int aLimit) Standard_Boolean IsEqual(const Link& aLink1, const Link& aLink2) { - return (aLink1.n1 == aLink2.n1 && aLink1.n2 == aLink2.n2 || - aLink1.n1 == aLink2.n2 && aLink1.n2 == aLink2.n1); + return (aLink1.n1 == aLink2.n1 && aLink1.n2 == aLink2.n2) || + (aLink1.n1 == aLink2.n2 && aLink1.n2 == aLink2.n1); } //================================================================================ @@ -475,11 +475,13 @@ bool NETGENPlugin_Mesher::fillNgMesh(netgen::OCCGeometry& occgeom, for ( int i = 0; i < 3; ++i ) { const SMDS_MeshNode* node = f->GetNode( i ), * inFaceNode=0; - if ( helper.IsSeamShape( node->GetPosition()->GetShapeId() )) - if ( helper.IsSeamShape( f->GetNodeWrap( i+1 )->GetPosition()->GetShapeId() )) + if ( helper.IsSeamShape( node->GetPosition()->GetShapeId() )) { + if ( helper.IsSeamShape( f->GetNodeWrap( i+1 )->GetPosition()->GetShapeId() )) { inFaceNode = f->GetNodeWrap( i-1 ); - else + } else { inFaceNode = f->GetNodeWrap( i+1 ); + } + } gp_XY uv = helper.GetNodeUV( geomFace, node, inFaceNode ); if ( reverse ) {