Merge remote branch 'origin/hydro/imps_2015'

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

diff --git a/src/GEOM/GEOM_BaseDriver.hxx b/src/GEOM/GEOM_BaseDriver.hxx
index 7313ea6024f9207785cbad2985839902b45ab165..61aa70f6ae7a275ab7131609bd94bb98641d08f8 100644 (file)
--- a/src/GEOM/GEOM_BaseDriver.hxx
+++ b/src/GEOM/GEOM_BaseDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -27,17 +27,26 @@
 #ifndef __GEOM_BaseDriver_HXX__
 #define __GEOM_BaseDriver_HXX__
 
+#include "GEOM_Function.hxx"
+
 #include <TFunction_Driver.hxx>
+#include <TFunction_Logbook.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 #include <TopAbs_State.hxx>
+#include <TColStd_HSequenceOfTransient.hxx>
+#include <TColStd_HArray1OfInteger.hxx>
+
+#include <Basics_OCCTVersion.hxx>
 
 #include <string>
 #include <vector>
 #include <sstream>
 
-class Handle(GEOM_Function);
-class Handle(TColStd_HSequenceOfTransient);
-class Handle(TColStd_HArray1OfInteger);
+#if OCC_VERSION_MAJOR < 7
+  #define LOGBOOK TFunction_Logbook
+#else
+  #define LOGBOOK Handle(TFunction_Logbook)
+#endif
 
 struct GEOM_Param
 {
@@ -98,7 +107,7 @@ public:
     return params.back();
   }
 
-  DEFINE_STANDARD_RTTI (GEOM_BaseDriver)
+  OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver)
 };
 
 DEFINE_STANDARD_HANDLE (GEOM_BaseDriver,TFunction_Driver);