Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 ea27b563507d42ae356b5c7ee4ab05e2af62cc81..d541f13449f838b9d4c595a4f4e4b61d123b7616 100644
(file)
--- a/
src/GEOM/GEOM_BaseDriver.hxx
+++ b/
src/GEOM/GEOM_BaseDriver.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
23 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
//
// 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 <TColStd_HSequenceOfTransient.hxx>
#include <TColStd_HArray1OfInteger.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include <string>
#include <vector>
#include <sstream>
#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;
struct GEOM_Param
{
std::string name;
@@
-105,9
+97,9
@@
public:
return params.back();
}
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
#endif