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_BaseObject.cxx
diff --git
a/src/GEOM/GEOM_BaseObject.cxx
b/src/GEOM/GEOM_BaseObject.cxx
index 16bf38ce14169ecd3a40302c751b7c52dfca3631..ebb7246f954d23d16997658a015a5d5f3ac4e503 100644
(file)
--- a/
src/GEOM/GEOM_BaseObject.cxx
+++ b/
src/GEOM/GEOM_BaseObject.cxx
@@
-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
@@
-293,7
+293,7
@@
TCollection_AsciiString GEOM_BaseObject::GetName()
aName = aNameAttr->Get();
// do not return pointer of local variable
// return aName.ToCString();
aName = aNameAttr->Get();
// do not return pointer of local variable
// return aName.ToCString();
- // the following code could lead to memory leak, so take care about rec
ie
ved pointer
+ // the following code could lead to memory leak, so take care about rec
ei
ved pointer
return aName;
}
return aName;
}
@@
-486,4
+486,4
@@
TDF_Label GEOM_BaseObject::GetFreeLabel()
return _label.FindChild(FREE_LABEL);
}
return _label.FindChild(FREE_LABEL);
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseObject, Standard_Transient );
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseObject, Standard_Transient )