From 66f244f657ea76549e12593259e8d9763667fcfd Mon Sep 17 00:00:00 2001
From: eap <eap@opencascade.com>
Date: Thu, 14 Nov 2013 14:25:12 +0000
Subject: [PATCH] Enable canceling Compute

---
 src/SMESH/SMESH_Gen.cxx     | 3 ---
 src/SMESH_I/SMESH_Gen_i.cxx | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/src/SMESH/SMESH_Gen.cxx b/src/SMESH/SMESH_Gen.cxx
index 793566ed9..c5addaf0e 100644
--- a/src/SMESH/SMESH_Gen.cxx
+++ b/src/SMESH/SMESH_Gen.cxx
@@ -392,8 +392,6 @@ bool SMESH_Gen::Compute(SMESH_Mesh &          aMesh,
   return ret;
 }
 
-
-#ifdef WITH_SMESH_CANCEL_COMPUTE
 //=============================================================================
 /*!
  * Prepare Compute a mesh
@@ -419,7 +417,6 @@ void SMESH_Gen::CancelCompute(SMESH_Mesh &          aMesh,
       _sm_current->ComputeStateEngine( SMESH_subMesh::COMPUTE_CANCELED );
     }
 }
-#endif
 
 //=============================================================================
 /*!
diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index 32b6fecfc..5bcf88bda 100644
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -1732,9 +1732,7 @@ CORBA::Boolean SMESH_Gen_i::Compute( SMESH::SMESH_Mesh_ptr theMesh,
         myLocShape = SMESH_Mesh::PseudoShape();
       // call implementation compute
       ::SMESH_Mesh& myLocMesh = meshServant->GetImpl();
-#ifdef WITH_SMESH_CANCEL_COMPUTE
       myGen.PrepareCompute( myLocMesh, myLocShape);
-#endif
       bool ok = myGen.Compute( myLocMesh, myLocShape);
       meshServant->CreateGroupServants(); // algos can create groups (issue 0020918)
       myLocMesh.GetMeshDS()->Modified();
@@ -1764,7 +1762,6 @@ CORBA::Boolean SMESH_Gen_i::Compute( SMESH::SMESH_Mesh_ptr theMesh,
 void SMESH_Gen_i::CancelCompute( SMESH::SMESH_Mesh_ptr theMesh,
                                  GEOM::GEOM_Object_ptr theShapeObject )
 {
-#ifdef WITH_SMESH_CANCEL_COMPUTE
   SMESH_Mesh_i* meshServant = dynamic_cast<SMESH_Mesh_i*>( GetServant( theMesh ).in() );
   ::SMESH_Mesh& myLocMesh = meshServant->GetImpl();
   TopoDS_Shape myLocShape;
@@ -1773,7 +1770,6 @@ void SMESH_Gen_i::CancelCompute( SMESH::SMESH_Mesh_ptr theMesh,
   else
     myLocShape = SMESH_Mesh::PseudoShape();
   myGen.CancelCompute( myLocMesh, myLocShape);
-#endif
 }
 
 //=============================================================================
-- 
2.30.2