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_Object.hxx
diff --git
a/src/GEOM/GEOM_Object.hxx
b/src/GEOM/GEOM_Object.hxx
index 716073151e3e7202613e373cd9402acd07cbf04b..3c6ca238f3f541f0e1c0a32b29529ad0d703f7ba 100644
(file)
--- a/
src/GEOM/GEOM_Object.hxx
+++ b/
src/GEOM/GEOM_Object.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
@@
-37,7
+37,7
@@
class GEOM_Object;
class TFunction_Driver;
class GEOM_Engine;
class TFunction_Driver;
class GEOM_Engine;
-DEFINE_STANDARD_HANDLE( GEOM_Object, GEOM_BaseObject )
;
+DEFINE_STANDARD_HANDLE( GEOM_Object, GEOM_BaseObject )
class GEOM_Object : public GEOM_BaseObject
{
class GEOM_Object : public GEOM_BaseObject
{
@@
-115,7
+115,7
@@
class GEOM_Object : public GEOM_BaseObject
GetLastFunctions( const std::list< Handle(GEOM_Object) >& theObjects );
public:
GetLastFunctions( const std::list< Handle(GEOM_Object) >& theObjects );
public:
-
OCCT_
DEFINE_STANDARD_RTTIEXT(GEOM_Object,GEOM_BaseObject)
+ DEFINE_STANDARD_RTTIEXT(GEOM_Object,GEOM_BaseObject)
};
#endif
};
#endif