Merge branch 'V9_7_BR'

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

diff --git a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx
index cba5d14920dde22c0dfe81d780d861b16552f8bc..e80eada99b1f72c3f691a75254e5c6524fc60987 100644 (file)
--- a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx
+++ b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,8 +20,6 @@
 #ifndef _AdvancedEngine_PipeTShapeDriver_HXX
 #define _AdvancedEngine_PipeTShapeDriver_HXX
 
-#include "AdvancedEngine.hxx"
-
 #include "GEOM_BaseDriver.hxx"
 #include "GEOMAlgo_State.hxx"
 
@@ -30,20 +28,18 @@
 #include <TColStd_HSequenceOfInteger.hxx>
 #include <Geom_Surface.hxx>
 
-DEFINE_STANDARD_HANDLE( AdvancedEngine_PipeTShapeDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( AdvancedEngine_PipeTShapeDriver, GEOM_BaseDriver )
 
-class ADVANCEDENGINE_EXPORT AdvancedEngine_PipeTShapeDriver : public GEOM_BaseDriver
+class AdvancedEngine_PipeTShapeDriver : public GEOM_BaseDriver
 {
 public:
  // Methods PUBLIC
   // 
   AdvancedEngine_PipeTShapeDriver();
-  virtual  Standard_Integer Execute(TFunction_Logbook& log) const; 
-  virtual void Validate(TFunction_Logbook&) const {}
-  Standard_Boolean MustExecute(const TFunction_Logbook&) const
-  {
-    return Standard_True;
-  }
+  virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+  virtual void Validate(Handle(TFunction_Logbook)&) const {}
+  Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
+
   static const Standard_GUID& GetID();
   ~AdvancedEngine_PipeTShapeDriver() {};
   
@@ -51,8 +47,7 @@ public:
                                      std::vector<GEOM_Param>& params);
   // Type management
   //
-DEFINE_STANDARD_RTTI( AdvancedEngine_PipeTShapeDriver )
-
+  DEFINE_STANDARD_RTTIEXT(AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver)
 private:
 
   /*!