From: rnv <rnv@opencascade.com>
Date: Wed, 1 Feb 2012 12:31:41 +0000 (+0000)
Subject: win32 compilation of the Mesh module.
X-Git-Tag: V6_5_0a1~155
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=24df7fa1abf1fb224675fb6d640c01a862600c12;p=modules%2Fsmesh.git

win32 compilation of the Mesh module.
---

diff --git a/src/SMESHUtils/SMESH_TypeDefs.hxx b/src/SMESHUtils/SMESH_TypeDefs.hxx
index 07b95e389..63ecd6bff 100644
--- a/src/SMESHUtils/SMESH_TypeDefs.hxx
+++ b/src/SMESHUtils/SMESH_TypeDefs.hxx
@@ -36,6 +36,7 @@
 #include <map>
 #include <list>
 #include <set>
+#include <cassert>
 
 typedef std::map<const SMDS_MeshElement*,
                  std::list<const SMDS_MeshElement*> >        TElemOfElemListMap;
diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
index 62b889bf8..bc497c74b 100644
--- a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
+++ b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
@@ -2062,7 +2062,7 @@ TopoDS_Edge StdMeshers_ProjectionUtils::GetBoundaryEdge(const TopoDS_Shape& edge
       PShapeIteratorPtr faceIt = SMESH_MesherHelper::GetAncestors( edge, mesh, TopAbs_FACE );
       while ( const TopoDS_Shape* face = faceIt->next() )
         if ( facesOfEdgeContainer.Contains( *face ))
-          if ( facesNearEdge.Add( *face ) and facesNearEdge.Extent() > 1 )
+          if ( facesNearEdge.Add( *face ) && facesNearEdge.Extent() > 1 )
             break;
       if ( facesNearEdge.Extent() == 1 )
         return edge;