From f5cd28fc53e81cd9e7a3c508b065db7a00d1d7d8 Mon Sep 17 00:00:00 2001
From: Alexander Golubev <fatzer2@gmail.com>
Date: Sun, 17 May 2015 17:26:44 +0300
Subject: [PATCH] Pivy: suppress warning

Warning was:
src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp|2303 col 31| warning:
'&&' within '||' [-Wlogical-op-parentheses]
||       !hasConstructionFaces() && elem->GetType() == SMDSAbs_Face ||
||       ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
---
 src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
index 2c0f616af..8b3cb7d53 100644
--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
@@ -2299,8 +2299,8 @@ void SMDS_Mesh::RemoveElement(const SMDS_MeshElement *        elem,
 {
   // get finite elements built on elem
   set<const SMDS_MeshElement*> * s1;
-  if (!hasConstructionEdges() && elem->GetType() == SMDSAbs_Edge ||
-      !hasConstructionFaces() && elem->GetType() == SMDSAbs_Face ||
+  if ((!hasConstructionEdges() && elem->GetType() == SMDSAbs_Edge) ||
+      (!hasConstructionFaces() && elem->GetType() == SMDSAbs_Face) ||
       elem->GetType() == SMDSAbs_Volume)
   {
     s1 = new set<const SMDS_MeshElement*>();