Implementation of gluing faces by given list (for PAL13191).

[modules/geom.git] / src / GEOM_I / GEOM_Object_i.cc

diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc
index c67e139c2c2c35c8202b5728db8b3d3990bd3bc9..29d40f29132dc3b50fcc6ff72444229ae3e19004 100644 (file)
--- a/src/GEOM_I/GEOM_Object_i.cc
+++ b/src/GEOM_I/GEOM_Object_i.cc
@@ -1,3 +1,22 @@
+// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either 
+// version 2.1 of the License.
+// 
+// This library is distributed in the hope that it will be useful 
+// but WITHOUT ANY WARRANTY; without even the implied warranty of 
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public  
+// License along with this library; if not, write to the Free Software 
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 #include <Standard_OStream.hxx>
 
 #include <GEOM_Object_i.hh>
@@ -31,9 +50,7 @@
 
 GEOM_Object_i::GEOM_Object_i (PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine,
                              Handle(GEOM_Object) theImpl)
-#ifndef WNT
 : SALOME::GenericObj_i( thePOA ), _engine(theEngine), _impl(theImpl)
-#endif
 {
   thePOA->activate_object(this);
 }
@@ -136,8 +153,8 @@ void GEOM_Object_i::SetStudyEntry(const char* theEntry)
 char* GEOM_Object_i::GetStudyEntry()
 {
   TCollection_AsciiString anEntry = _impl->GetAuxData();
-  if(!anEntry.IsEmpty()) return strdup(anEntry.ToCString());
-  return strdup("");
+  if(!anEntry.IsEmpty()) return CORBA::string_dup(anEntry.ToCString());
+  return CORBA::string_dup("");
 }
 
 
@@ -236,9 +253,9 @@ SALOMEDS::TMPFile* GEOM_Object_i::GetShapeStream()
 //function : getShape
 //purpose  : return the TopoDS_Shape when client and servant are colocated, be careful
 //=======================================================================
-long GEOM_Object_i::getShape() {
+CORBA::LongLong GEOM_Object_i::getShape() {
   _geom = _impl->GetValue();
-  return((long)(&_geom));
+  return ((CORBA::LongLong)(&_geom));
 }
 
 //=============================================================================