Merge V8_4_BR branch.

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

diff --git a/src/GEOMImpl/GEOMImpl_PrismDriver.cxx b/src/GEOMImpl/GEOMImpl_PrismDriver.cxx
index 528f6671d71488f1f016b9137f041a5a17478ffd..68fb9275656662d5d09246f05baff7ac247c3df9 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_PrismDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_PrismDriver.cxx
@@ -95,7 +95,7 @@ GEOMImpl_PrismDriver::GEOMImpl_PrismDriver()
 //function : Execute
 //purpose  :
 //=======================================================================
-Standard_Integer GEOMImpl_PrismDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_PrismDriver::Execute(Handle(TFunction_Logbook)& log) const
 {
   if (Label().IsNull()) return 0;
   Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
@@ -256,11 +256,7 @@ Standard_Integer GEOMImpl_PrismDriver::Execute(LOGBOOK& log) const
     aFunction->SetValue(aRes);
   }
   
-#if OCC_VERSION_MAJOR < 7
-  log.SetTouched(Label());
-#else
   log->SetTouched(Label());
-#endif
 
   return 1;
 }
@@ -559,4 +555,4 @@ GetCreationInformation(std::string&             theOperationName,
   return true;
 }
 
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PrismDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PrismDriver,GEOM_BaseDriver);