From: jfa <jfa@opencascade.com>
Date: Wed, 31 Jan 2007 09:58:03 +0000 (+0000)
Subject: NPAL14678: regression of GEOM_Object::getShape(). Return CORBA::LongLong instead... 
X-Git-Tag: V3_2_5pre1~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=00c1c15d5ca2b0656e2236abee55e7e6dc601e1c;p=modules%2Fgeom.git

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

diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl
index 59f490e7f..92c21c709 100644
--- a/idl/GEOM_Gen.idl
+++ b/idl/GEOM_Gen.idl
@@ -147,7 +147,7 @@ module GEOM
     /*!
      *  Get the TopoDS_Shape, for colocated case only.
      */
-    long getShape();
+    long long getShape();
 
     /*!
      ######################################################################
diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc
index 62aa57a71..29d40f291 100644
--- a/src/GEOM_I/GEOM_Object_i.cc
+++ b/src/GEOM_I/GEOM_Object_i.cc
@@ -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));
 }
 
 //=============================================================================
diff --git a/src/GEOM_I/GEOM_Object_i.hh b/src/GEOM_I/GEOM_Object_i.hh
index 42b5f2781..bb4973573 100644
--- a/src/GEOM_I/GEOM_Object_i.hh
+++ b/src/GEOM_I/GEOM_Object_i.hh
@@ -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(); }