Merge V8_4_BR branch.

[modules/geom.git] / src / GEOMImpl / GEOMImpl_GlueDriver.cxx

diff --git a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx
index 9cd01950cedcb6d64c259d3645bd1e16ef8ff05f..20ab8d47fddc6e88259c0a16eab96bd0c1b7a884 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx
@@ -34,8 +34,6 @@
 #include "GEOMAlgo_CoupleOfShapes.hxx"
 #include "GEOMAlgo_ListOfCoupleOfShapes.hxx"
 
-#include <Basics_OCCTVersion.hxx>
-
 #include "utilities.h"
 
 #include <BRep_Builder.hxx>
@@ -739,7 +737,7 @@ TopoDS_Shape GEOMImpl_GlueDriver::GlueByList (const TopoDS_Shape& theShape,
 //function : Execute
 //purpose  :
 //=======================================================================
-Standard_Integer GEOMImpl_GlueDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_GlueDriver::Execute(Handle(TFunction_Logbook)& log) const
 {
   if (Label().IsNull()) return 0;
   Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
@@ -824,11 +822,7 @@ Standard_Integer GEOMImpl_GlueDriver::Execute(LOGBOOK& log) const
 
   aFunction->SetValue(aShape);
 
-#if OCC_VERSION_MAJOR < 7
-  log.SetTouched(Label());
-#else
   log->SetTouched(Label());
-#endif
 
   if (!aWrn.IsEmpty()) {
     Standard_Failure::Raise(aWrn.ToCString());
@@ -886,4 +880,4 @@ GetCreationInformation(std::string&             theOperationName,
   return true;
 }
 
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_GlueDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_GlueDriver,GEOM_BaseDriver);