Merge branch 'V9_11_BR'

[modules/geom.git] / src / GEOM / GEOM_BaseDriver.hxx

diff --git a/src/GEOM/GEOM_BaseDriver.hxx b/src/GEOM/GEOM_BaseDriver.hxx
index 61aa70f6ae7a275ab7131609bd94bb98641d08f8..d541f13449f838b9d4c595a4f4e4b61d123b7616 100644 (file)
--- a/src/GEOM/GEOM_BaseDriver.hxx
+++ b/src/GEOM/GEOM_BaseDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -36,18 +36,10 @@
 #include <TColStd_HSequenceOfTransient.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 
-#include <Basics_OCCTVersion.hxx>
-
 #include <string>
 #include <vector>
 #include <sstream>
 
-#if OCC_VERSION_MAJOR < 7
-  #define LOGBOOK TFunction_Logbook
-#else
-  #define LOGBOOK Handle(TFunction_Logbook)
-#endif
-
 struct GEOM_Param
 {
   std::string name;
@@ -76,8 +68,6 @@ struct GEOM_Param
 class GEOM_BaseDriver : public TFunction_Driver
 {
 public:
-  // Returns document id
-  Standard_EXPORT int GetDocID() const;
   
   // Returns a name of creation operation and names and values of creation parameters
   // (Use AddParam() methods declared below to fill params vector while implementing
@@ -107,9 +97,9 @@ public:
     return params.back();
   }
 
-  OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver)
+  DEFINE_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver)
 };
 
-DEFINE_STANDARD_HANDLE (GEOM_BaseDriver,TFunction_Driver);
+DEFINE_STANDARD_HANDLE (GEOM_BaseDriver,TFunction_Driver)
 
 #endif