X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHELLO%2FHELLO.hxx;h=f55129051b66e8620186d4e9f9631bc11eaf3e57;hb=87b65d3a65a4ca2f90d85ef9bbe55f2c2b77826b;hp=f4dad9856422e82af172b9551a0b9ee6a9b5effb;hpb=0f6233f2102032f7f6e5f4dde2657175d7bd80f4;p=samples%2Fhello.git

diff --git a/src/HELLO/HELLO.hxx b/src/HELLO/HELLO.hxx
index f4dad98..f551290 100644
--- a/src/HELLO/HELLO.hxx
+++ b/src/HELLO/HELLO.hxx
@@ -1,11 +1,14 @@
-// Copyright (C) 2005  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2021  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
 //
 // 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.
+// version 2.1 of the License, or (at your option) any later version.
 //
-// This library is distributed in the hope that it will be useful
+// 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.
@@ -16,39 +19,76 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef _HELLO_HXX_
 #define _HELLO_HXX_
 
+#ifdef WIN32
+# if defined HELLOENGINE_EXPORTS || defined HELLOEngine_EXPORTS
+#  define HELLOENGINE_EXPORT __declspec( dllexport )
+# else
+#  define HELLOENGINE_EXPORT __declspec( dllimport )
+# endif
+#else
+# define HELLOENGINE_EXPORT
+#endif
+
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(HELLO_Gen)
-#include "SALOME_Component_i.hxx"
+#include <SALOME_Component_i.hxx>
 
-class HELLO:
+class HELLOENGINE_EXPORT HELLO_Abstract :
   public POA_HELLO_ORB::HELLO_Gen,
   public Engines_Component_i 
 {
-
 public:
-    HELLO(CORBA::ORB_ptr orb,
-	    PortableServer::POA_ptr poa,
-	    PortableServer::ObjectId * contId, 
-	    const char *instanceName, 
-	    const char *interfaceName);
-    virtual ~HELLO();
+  HELLO_Abstract( CORBA::ORB_ptr orb,
+	 PortableServer::POA_ptr poa,
+	 PortableServer::ObjectId* contId, 
+	 const char* instanceName, 
+	 const char* interfaceName ,
+	 bool withRegistry = true);
+  virtual ~HELLO_Abstract();
 
-    //
+  HELLO_ORB::status hello  ( const char* name );
+  HELLO_ORB::status goodbye( const char* name );
+  void              copyOrMove( const HELLO_ORB::object_list& what,
+				SALOMEDS::SObject_ptr where,
+				CORBA::Long row, CORBA::Boolean isCopy );
+  virtual char*     getVersion();
+  // Get Study
+  virtual SALOMEDS::Study_var getStudyServant() = 0;
+};
 
-    char* makeBanner(const char* name);
+class HELLOENGINE_EXPORT HELLO_Session : public HELLO_Abstract
+{
+public:
+  HELLO_Session( CORBA::ORB_ptr orb,
+	 PortableServer::POA_ptr poa,
+	 PortableServer::ObjectId* contId, 
+	 const char* instanceName, 
+	 const char* interfaceName):HELLO_Abstract(orb,poa,contId,instanceName,interfaceName,true) { }
+   SALOMEDS::Study_var getStudyServant() override;
+};
 
+class HELLOENGINE_EXPORT HELLO_No_Session : public HELLO_Abstract
+{
+public:
+  HELLO_No_Session( CORBA::ORB_ptr orb,
+	 PortableServer::POA_ptr poa,
+	 PortableServer::ObjectId* contId, 
+	 const char* instanceName, 
+	 const char* interfaceName):HELLO_Abstract(orb,poa,contId,instanceName,interfaceName,false) { }
+  SALOMEDS::Study_var getStudyServant() override;
 };
 
 extern "C"
-    PortableServer::ObjectId * HELLOEngine_factory(
-	    CORBA::ORB_ptr orb,
-	    PortableServer::POA_ptr poa,
-	    PortableServer::ObjectId * contId,
-	    const char *instanceName,
-	    const char *interfaceName);
-
+HELLOENGINE_EXPORT
+PortableServer::ObjectId* HELLOEngine_factory( CORBA::ORB_ptr orb,
+					       PortableServer::POA_ptr poa,
+					       PortableServer::ObjectId* contId,
+					       const char* instanceName,
+					       const char* interfaceName );
 
 #endif