suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

3rdParty/salomesmesh: suppress several small warnings

Browse Source 
Warnings was about a struct declared as type and as usual added several
additional brackets.
This commit is contained in:
Alexander Golubev 2015-08-08 01:24:37 +03:00 committed by wmayer
parent c3dfc7e30c
commit a8634f09fc
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdParty/salomesmesh/inc/SMESH_subMesh.hxx vendored
View File

@ -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;

2
src/3rdParty/salomesmesh/inc/SMESH_subMeshEventListener.hxx vendored
View File

@ -33,7 +33,7 @@
class SMESH_subMesh;
class SMESH_Hypothesis;
struct SMESH_subMeshEventListenerData;
struct SMESH_subMeshEventListenerData;
// ------------------------------------------------------------------
/*!

12
src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp vendored
View File

@ -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 ) {