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

Pivy: suppress warning

Browse Source 
Warning was:
src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp|2303 col 31| warning:
'&&' within '||' [-Wlogical-op-parentheses]
||       !hasConstructionFaces() && elem->GetType() == SMDSAbs_Face ||
||       ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This commit is contained in:
Alexander Golubev 2015-05-17 17:26:44 +03:00 committed by wmayer
parent 4b992c27bb
commit f5cd28fc53
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp vendored
View File

@ -2299,8 +2299,8 @@ void SMDS_Mesh::RemoveElement(const SMDS_MeshElement * elem,
{ {
// get finite elements built on elem // get finite elements built on elem
set<const SMDS_MeshElement*> * s1; set<const SMDS_MeshElement*> * s1;
if (!hasConstructionEdges() && elem->GetType() == SMDSAbs_Edge || if ((!hasConstructionEdges() && elem->GetType() == SMDSAbs_Edge) ||
!hasConstructionFaces() && elem->GetType() == SMDSAbs_Face || (!hasConstructionFaces() && elem->GetType() == SMDSAbs_Face) ||
elem->GetType() == SMDSAbs_Volume) elem->GetType() == SMDSAbs_Volume)
{ {
s1 = new set<const SMDS_MeshElement*>(); s1 = new set<const SMDS_MeshElement*>();