From: gdd <gdd>
Date: Thu, 7 Jun 2012 11:26:44 +0000 (+0000)
Subject: Fix for compilation with gcc 4.7
X-Git-Tag: V6_6_0a1~299
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=86c4cc3003af398fdaa81a25e7e4f3644a8c2e5a;p=modules%2Fsmesh.git

Fix for compilation with gcc 4.7
---

diff --git a/src/SMDS/SMDS_Mesh.cxx b/src/SMDS/SMDS_Mesh.cxx
index fbacb46a2..da41acc82 100644
--- a/src/SMDS/SMDS_Mesh.cxx
+++ b/src/SMDS/SMDS_Mesh.cxx
@@ -2828,7 +2828,7 @@ struct MYNode_Map_Iterator: public FATHER
   template <typename ELEM=const SMDS_MeshElement*>
   class IdSortedIterator : public SMDS_Iterator<ELEM>
   {
-    const SMDS_MeshElementIDFactory& myIDFact;
+    SMDS_MeshElementIDFactory&       myIDFact;
     int                              myID, myMaxID, myNbFound, myTotalNb;
     SMDSAbs_ElementType              myType;
     ELEM                             myElem;
diff --git a/src/SMESH/SMESH_MeshEditor.cxx b/src/SMESH/SMESH_MeshEditor.cxx
index e3fbc6602..3b1cb08e6 100644
--- a/src/SMESH/SMESH_MeshEditor.cxx
+++ b/src/SMESH/SMESH_MeshEditor.cxx
@@ -4865,7 +4865,6 @@ SMESH_MeshEditor::ExtrusionAlongTrack (TIDSortedElemSet &   theElements,
     const SMDS_MeshElement* currentElem = NULL;
     int totalNbEdges = theTrack->NbEdges();
     SMDS_ElemIteratorPtr nIt;
-    bool isClosed = false;
 
     //check start node
     if( !theTrack->GetMeshDS()->Contains(theN1) ) {
@@ -4897,7 +4896,6 @@ SMESH_MeshEditor::ExtrusionAlongTrack (TIDSortedElemSet &   theElements,
         //case of the closed mesh
         if(currentNode == theN1) {
           nbEdges++;
-          isClosed = true;
           break;
         }
 
diff --git a/src/SMESHUtils/SMESH_File.cxx b/src/SMESHUtils/SMESH_File.cxx
index b0341ba5c..8a69d1cc0 100644
--- a/src/SMESHUtils/SMESH_File.cxx
+++ b/src/SMESHUtils/SMESH_File.cxx
@@ -36,6 +36,7 @@
 #ifdef WIN32
 #include <io.h>
 #else
+#include <unistd.h>
 #include <sys/mman.h>
 #endif