From 8ca3b0479013f087a431c93b833deb6bdb12c294 Mon Sep 17 00:00:00 2001 From: gka Date: Mon, 21 Sep 2020 14:30:22 +0300 Subject: [PATCH] #314 Integration of the Message_ProgressIndicator in the BRep_Mesh and Express_Mesh Patch for binary compatibility with old version BRep_Mesh --- src/BRepMesh/BRepMesh_DiscretRoot.hxx | 4 +--- src/BRepMesh/BRepMesh_IncrementalMesh.cxx | 2 +- src/BRepMesh/BRepMesh_IncrementalMesh.hxx | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/BRepMesh/BRepMesh_DiscretRoot.hxx b/src/BRepMesh/BRepMesh_DiscretRoot.hxx index cbdda70e77..a2aed351f6 100644 --- a/src/BRepMesh/BRepMesh_DiscretRoot.hxx +++ b/src/BRepMesh/BRepMesh_DiscretRoot.hxx @@ -50,9 +50,7 @@ public: Standard_EXPORT virtual void Perform () =0; - //! Compute triangulation for set shape. - Standard_EXPORT virtual void Perform (const Handle(Message_ProgressIndicator) &theProgress ) = 0; - + DEFINE_STANDARD_RTTIEXT(BRepMesh_DiscretRoot,Standard_Transient) diff --git a/src/BRepMesh/BRepMesh_IncrementalMesh.cxx b/src/BRepMesh/BRepMesh_IncrementalMesh.cxx index 9a5cd9cb5e..7d73621446 100644 --- a/src/BRepMesh/BRepMesh_IncrementalMesh.cxx +++ b/src/BRepMesh/BRepMesh_IncrementalMesh.cxx @@ -108,7 +108,7 @@ BRepMesh_IncrementalMesh::BRepMesh_IncrementalMesh( const TopoDS_Shape& theSh //purpose : //======================================================================= BRepMesh_IncrementalMesh::BRepMesh_IncrementalMesh (const TopoDS_Shape& theShape, - const BRepMesh_FastDiscret::Parameters& theParameters) : + const BRepMesh_FastDiscret::Parameters& theParameters) : myParameters(theParameters) { myShape = theShape; diff --git a/src/BRepMesh/BRepMesh_IncrementalMesh.hxx b/src/BRepMesh/BRepMesh_IncrementalMesh.hxx index 0f7601b4b9..48dfadce44 100644 --- a/src/BRepMesh/BRepMesh_IncrementalMesh.hxx +++ b/src/BRepMesh/BRepMesh_IncrementalMesh.hxx @@ -80,7 +80,7 @@ public: //! @name mesher API Standard_EXPORT virtual void Perform() Standard_OVERRIDE; //! Performs meshing ot the shape. - Standard_EXPORT virtual void Perform(const Handle(Message_ProgressIndicator) &theProgress) Standard_OVERRIDE; + Standard_EXPORT void Perform(const Handle(Message_ProgressIndicator) &theProgress); public: //! @name accessing to parameters. -- 2.39.5