ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-03-26 17:37:55 +05:00
Code Issues Packages Projects Releases Wiki Activity

NPAL14678: regression of GEOM_Object::getShape(). Return CORBA::LongLong instead of CORBA::Long, because on 64-bits platforms address occupies 64 bits.

Browse Source
This commit is contained in:
jfa 2007-01-31 09:58:03 +00:00
parent a8871229bd
commit 00c1c15d5c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
idl/GEOM_Gen.idl
View File

@ -147,7 +147,7 @@ module GEOM
/*!
* Get the TopoDS_Shape, for colocated case only.
*/
long getShape();
long long getShape();
/*!
######################################################################

4
src/GEOM_I/GEOM_Object_i.cc
View File

@ -253,9 +253,9 @@ SALOMEDS::TMPFile* GEOM_Object_i::GetShapeStream()
//function : getShape
//purpose : return the TopoDS_Shape when client and servant are colocated, be careful
//=======================================================================
CORBA::Long GEOM_Object_i::getShape() {
CORBA::LongLong GEOM_Object_i::getShape() {
_geom = _impl->GetValue();
return CORBA::Long(size_t(&_geom));
return ((CORBA::LongLong)(&_geom));
}
//=============================================================================

2
src/GEOM_I/GEOM_Object_i.hh
View File

@ -60,7 +60,7 @@ class GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public virtual SALOM
virtual SALOMEDS::TMPFile* GetShapeStream();
virtual CORBA::Long getShape();
virtual CORBA::LongLong getShape();
virtual bool IsMainShape() { return _impl->IsMainShape(); }