From 79fe25c5be9df5c020b0b14ed8a3545694f24f99 Mon Sep 17 00:00:00 2001 From: Viktor Uzlov Date: Fri, 19 Feb 2021 13:02:56 +0300 Subject: [PATCH] Windows build, fix errors --- src/Controls/SMESH_ControlsDef.hxx | 2 +- src/SMESH_I/SMESH_Mesh_i.cxx | 2 +- src/SMESH_I/SMESH_PythonDump.cxx | 7 +++++++ src/SMESH_I/SMESH_PythonDump.hxx | 3 +++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Controls/SMESH_ControlsDef.hxx b/src/Controls/SMESH_ControlsDef.hxx index 1f6411b50..e72b64b32 100644 --- 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& GetDomainIDs() const { return myOkIDs; } diff --git a/src/SMESH_I/SMESH_Mesh_i.cxx b/src/SMESH_I/SMESH_Mesh_i.cxx index 8ed2c4887..75e3de93b 100644 --- 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(elemID), FromIdType(elemID + 1) }); else lastRange.toID = elemID + 1; diff --git a/src/SMESH_I/SMESH_PythonDump.cxx b/src/SMESH_I/SMESH_PythonDump.cxx index dc45bcd17..21759ac60 100644 --- 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<