Migration to OCCT 7.0

[modules/geom.git] / src / AdvancedEngine / AdvancedEngine_PipeTShapeDriver.cxx

diff --git a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx
index e2d7d501ae31fff07f62890f354ceebf481b70ae..1b890ef36fabacd1e0a89378830634de5ce75abe 100644 (file)
--- a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx
+++ b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx
@@ -38,7 +38,6 @@
 #include <gp_Pln.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Trsf.hxx>
-#include <TFunction_Logbook.hxx>
 #include <StdFail_NotDone.hxx>
 #include <BRepPrimAPI_MakeCone.hxx>
 #include <BRepPrimAPI_MakeCylinder.hxx>
@@ -401,7 +400,7 @@ TopoDS_Shape AdvancedEngine_PipeTShapeDriver::MakeQuarterPipeTShape (const doubl
 //function : Execute
 //purpose  :
 //=======================================================================
-Standard_Integer AdvancedEngine_PipeTShapeDriver::Execute (TFunction_Logbook& log) const
+Standard_Integer AdvancedEngine_PipeTShapeDriver::Execute(LOGBOOK& log) const
 {
   if (Label().IsNull()) return 0;
   Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
@@ -624,7 +623,11 @@ Standard_Integer AdvancedEngine_PipeTShapeDriver::Execute (TFunction_Logbook& lo
 
   aFunction->SetValue(aShape);
 
+#if OCC_VERSION_MAJOR < 7
   log.SetTouched(Label());
+#else
+  log->SetTouched(Label());
+#endif
 
   return 1;
 }
@@ -685,5 +688,4 @@ GetCreationInformation(std::string&             theOperationName,
   return true;
 }
 
-IMPLEMENT_STANDARD_HANDLE (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver);