X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FLogger%2FSALOME_Logger_Server.hxx;h=b7f0b913f91e78ff07062d0ad82ee92178c647fd;hb=e379646b647cf817ef93f995cbd123458eae0c52;hp=74ef8e4d05f1f9b2850c5814d4d9284cfd36e9d7;hpb=e6bfea36374791cd31c274a2f97df90dc60ddaf3;p=modules%2Fkernel.git

diff --git a/src/Logger/SALOME_Logger_Server.hxx b/src/Logger/SALOME_Logger_Server.hxx
index 74ef8e4d0..b7f0b913f 100644
--- a/src/Logger/SALOME_Logger_Server.hxx
+++ b/src/Logger/SALOME_Logger_Server.hxx
@@ -1,28 +1,54 @@
-//  SALOME Logger : CORBA server managing trace output
+//  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
+//
+//  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.
 //
-//  Copyright (C) 2003  CEA/DEN, EDF R&D
+//  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
 //
+//  SALOME Logger : CORBA server managing trace output
 //  File   : SALOME_Logger_Server.hxx
 //  Author : Vasily Rusyaev
 //  Module : SALOME
-
+//
 #if !defined SALOME_Logger_Server_include
 #define SALOME_Logger_Server_include
 
-#ifndef WNT
-#include <fstream.h>
-#else
+#include <SALOMEconfig.h>
 #include <fstream>
+
+#ifdef WIN32
 #include <iosfwd>
 #endif
 #include <omnithread.h>
 #include "Logger.hh"
 
-class Logger :
-  public POA_SALOME_Logger::Logger,
-  public PortableServer::RefCountServantBase 
+#ifdef WIN32
+# if defined LOGGER_EXPORTS || defined SalomeLoggerServer_EXPORTS
+#  define LOGGER_EXPORT __declspec( dllexport )
+# else
+#  define LOGGER_EXPORT __declspec( dllimport )
+# endif
+#else
+# define LOGGER_EXPORT
+#endif
+
+
+class LOGGER_EXPORT Logger :
+  public POA_SALOME_Logger::Logger
 {
 public:
         //constructor w/o parameters
@@ -35,18 +61,19 @@ public:
 	//put message into one special place for all servers
 	void putMessage(const char* message);
         void ping();
+        void SetOrb( CORBA::ORB_ptr orb ) { _orb = CORBA::ORB::_duplicate(orb); return; }
+	void shutdown() { if(!CORBA::is_nil(_orb)) _orb->shutdown(0); };  
 private:
 	//if m_putIntoFile is true all messages will be put into special 
 	//otherwise all messages will be put into terminal via cout 
         bool m_putIntoFile;
 	//ofstream class specialized for disk file output
-#ifndef WNT
-        ofstream m_outputFile; 
-#else
-		std::ofstream m_outputFile; 
-#endif
+	std::ofstream m_outputFile; 
+
 	//synchronisation object
 	static omni_mutex myLock;
+
+	CORBA::ORB_ptr _orb;
 };
 
 #endif // !defined(SALOME_Logger_Server_include)