Mantis issues 0020573 and 0020603: Partition problems. A fix by Peter KURNEV.

[modules/geom.git] / src / GEOMClient / GEOM_Client.hxx

diff --git a/src/GEOMClient/GEOM_Client.hxx b/src/GEOMClient/GEOM_Client.hxx
index 09d4351b7d4782709bef7eae208dfd7103009bd4..0f08581ba02e0b66f7d412c08b558a6f9b695fb9 100644 (file)
--- a/src/GEOMClient/GEOM_Client.hxx
+++ b/src/GEOMClient/GEOM_Client.hxx
@@ -1,36 +1,34 @@
-//  GEOM GEOMClient : tool to transfer BREP files from GEOM server to GEOM client
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, 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  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//  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
+//
+//  GEOM GEOMClient : tool to transfer BREP files from GEOM server to GEOM client
 //  File   : GEOM_Client.hxx
 //  Author : Yves FRICAUD
 //  Module : GEOM
 //  $Header$
-
+//
 #ifndef _GEOM_Client_HeaderFile
 #define _GEOM_Client_HeaderFile
 
 #include <SALOMEconfig.h>
-#include CORBA_SERVER_HEADER(GEOM_Shape)
 #include CORBA_SERVER_HEADER(GEOM_Gen)
 #
 #ifndef _TColStd_SequenceOfAsciiString_HeaderFile
@@ -53,10 +51,28 @@ class TopoDS_Shape;
 #include <Standard_Macro.hxx>
 #endif
 
+#ifdef WNT
+ #if defined GEOMCLIENT_EXPORTS || defined GEOMClient_EXPORTS
+  #if defined WIN32
+   #define GEOMCLIENT_EXPORT __declspec( dllexport )
+  #else
+   #define GEOMCLIENT_EXPORT
+  #endif
+ #else
+  #if defined WIN32
+   #define GEOMCLIENT_EXPORT __declspec( dllimport )
+  #else
+   #define GEOMCLIENT_EXPORT
+  #endif
+ #endif
+#else
+ #define GEOMCLIENT_EXPORT
+#endif
+
 //=====================================================================
 // GEOM_Client : class definition
 //=====================================================================
-class GEOM_Client  {
+class GEOMCLIENT_EXPORT GEOM_Client  {
 
 public:
   
@@ -74,19 +90,32 @@ public:
   }
   // Methods PUBLIC
   // 
-  Standard_EXPORT   GEOM_Client();
-  Standard_EXPORT   Standard_Integer Find( const TCollection_AsciiString& ShapeIOR, TopoDS_Shape& S ) ;
-  Standard_EXPORT   void Bind( const TCollection_AsciiString& ShapeIOR, const TopoDS_Shape& S ) ;
-  Standard_EXPORT   TopoDS_Shape GetShape( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Shape_ptr aShape );
-  Standard_EXPORT   void RemoveShapeFromBuffer( const TCollection_AsciiString& shapeIOR ) ;
-  Standard_EXPORT   void ClearClientBuffer() ;
-  Standard_EXPORT   unsigned int BufferLength() ;
+   //Standard_EXPORT   
+  GEOM_Client();
+  //Standard_EXPORT   
+  GEOM_Client(Engines::Container_ptr client);
+  //Standard_EXPORT   
+  Standard_Integer Find( const TCollection_AsciiString& IOR, TopoDS_Shape& S ) ;
+  //Standard_EXPORT   
+  Standard_Integer Find( const TopoDS_Shape& S, TCollection_AsciiString& IOR ) ;
+  //Standard_EXPORT   
+  void Bind( const TCollection_AsciiString& IOR, const TopoDS_Shape& S ) ;
+  //Standard_EXPORT   
+  TopoDS_Shape GetShape( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_ptr aShape );
+  //Standard_EXPORT   
+  void RemoveShapeFromBuffer( const TCollection_AsciiString& IOR ) ;
+  //Standard_EXPORT   
+  void ClearClientBuffer() ;
+  //Standard_EXPORT   
+  unsigned int BufferLength() ;
+  TopoDS_Shape Load( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_ptr aShape);
 
 private: 
   // Fields PRIVATE
   //
   TColStd_SequenceOfAsciiString myIORs ;
   TopTools_SequenceOfShape myShapes ;
+  long  pid_client;
 };