Migration to OCCT 7.0

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

diff --git a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx
index 02b291b3a32eae2bb03b4af73a133fa27fbc6a16..6d4bb52c2af9ba9607978cad983acf87c79c2005 100644 (file)
--- a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx
+++ b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx
@@ -25,7 +25,6 @@
 
 #include "GEOM_Function.hxx"
 
-#include <TFunction_Logbook.hxx>
 #include <StdFail_NotDone.hxx>
 
 #include <TopoDS_Vertex.hxx>
@@ -98,7 +97,7 @@ AdvancedEngine_SmoothingSurfaceDriver::AdvancedEngine_SmoothingSurfaceDriver()
 //purpose  :
 //=======================================================================
 TopoDS_Shape AdvancedEngine_SmoothingSurfaceDriver::MakeSmoothingSurfaceUnClosed
-                          (const Handle_TColgp_HArray1OfPnt &theListOfPoints,
+                          (const Handle(TColgp_HArray1OfPnt) &theListOfPoints,
                            const Standard_Integer            theNbMax,
                            const Standard_Integer            theDegMax,
                            const Standard_Real               theDMax) const
@@ -165,7 +164,7 @@ TopoDS_Shape AdvancedEngine_SmoothingSurfaceDriver::MakeSmoothingSurfaceUnClosed
 //function : Execute
 //purpose  :
 //=======================================================================
-Standard_Integer AdvancedEngine_SmoothingSurfaceDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer AdvancedEngine_SmoothingSurfaceDriver::Execute(LOGBOOK& log) const
 {
   if (Label().IsNull()) return 0;
   Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
@@ -223,7 +222,11 @@ Standard_Integer AdvancedEngine_SmoothingSurfaceDriver::Execute(TFunction_Logboo
 
   aFunction->SetValue(aShape);
 
+#if OCC_VERSION_MAJOR < 7
   log.SetTouched(Label());
+#else
+  log->SetTouched(Label());
+#endif
 
   return 1;
 }
@@ -271,5 +274,4 @@ GetCreationInformation(std::string&             theOperationName,
   return true;
 }
 
-IMPLEMENT_STANDARD_HANDLE (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver);