Windows build, fix errors

diff --git a/src/Controls/SMESH_ControlsDef.hxx b/src/Controls/SMESH_ControlsDef.hxx
index 1f6411b500e9bc37185aa4f2305739c4ba883f4d..e72b64b324fecb23cf35d42900a834320f2b0aee 100644 (file)
--- a/src/Controls/SMESH_ControlsDef.hxx
+++ b/src/Controls/SMESH_ControlsDef.hxx
@@ -1174,7 +1174,7 @@ namespace SMESH{
       virtual              SMDSAbs_ElementType GetType() const;
 
       virtual void         SetMesh( const SMDS_Mesh* theMesh );
-      virtual bool         IsSatisfy( smIdType theElementId );
+      virtual bool         IsSatisfy( long theElementId );
 
       //const std::set<long>& GetDomainIDs() const { return myOkIDs; }
 

diff --git a/src/SMESH_I/SMESH_Mesh_i.cxx b/src/SMESH_I/SMESH_Mesh_i.cxx
index 8ed2c48874bb2d708b0136a055b4c93c71303831..75e3de93beac60ed1740c3a9a9c5f38e6e07e634 100644 (file)
--- a/src/SMESH_I/SMESH_Mesh_i.cxx
+++ b/src/SMESH_I/SMESH_Mesh_i.cxx
@@ -2095,7 +2095,7 @@ void SMESH_Mesh_i::ReplaceShape(GEOM::GEOM_Object_ptr theNewGeom)
         TRange &        lastRange = ranges.back();
         if ( lastRange.shapeID != shapeID ||
              lastRange.toID    != elemID )
-          ranges.push_back( TRange{ shapeID, elemID, elemID + 1 });
+          ranges.push_back( TRange{ shapeID, FromIdType<int>(elemID), FromIdType<int>(elemID + 1) });
         else
           lastRange.toID = elemID + 1;
 

diff --git a/src/SMESH_I/SMESH_PythonDump.cxx b/src/SMESH_I/SMESH_PythonDump.cxx
index dc45bcd17063d23bdb5b99efa661be4729b8d28a..21759ac604bea2734f2f3bee27563792dd1b0fed 100644 (file)
--- a/src/SMESH_I/SMESH_PythonDump.cxx
+++ b/src/SMESH_I/SMESH_PythonDump.cxx
@@ -139,6 +139,13 @@ namespace SMESH
     return *this;
   }
 
+  TPythonDump&
+  TPythonDump::
+  operator<<(SMESH::smIdType theArg){
+    myStream<<theArg;
+    return *this;
+  }
+
   TPythonDump&
   TPythonDump::
   operator<<(double theArg){

diff --git a/src/SMESH_I/SMESH_PythonDump.hxx b/src/SMESH_I/SMESH_PythonDump.hxx
index 0f690640e0a6cd77dde9d5020fc746e72e24be7c..5ce60488c2bc77f7686e3c27bed7ccb8bfa698e6 100644 (file)
--- a/src/SMESH_I/SMESH_PythonDump.hxx
+++ b/src/SMESH_I/SMESH_PythonDump.hxx
@@ -134,6 +134,9 @@ namespace SMESH
     TPythonDump&
     operator<<(int theArg);
 
+    TPythonDump&
+    operator<<(SMESH::smIdType theArg);
+
     TPythonDump&
     operator<<(double theArg);