Replace deprecated WNT macro definition by WIN32.

[modules/kernel.git] / src / Utils / Utils_ORB_INIT.hxx

diff --git a/src/Utils/Utils_ORB_INIT.hxx b/src/Utils/Utils_ORB_INIT.hxx
index 8ec2770f1b2d3c02f923e530fa93896d0101e8c7..26aff2f2e5aa2cb0b8286f25fa99a8b5604040ff 100644 (file)
--- a/src/Utils/Utils_ORB_INIT.hxx
+++ b/src/Utils/Utils_ORB_INIT.hxx
@@ -1,51 +1,45 @@
-//  SALOME Utils : general SALOME's definitions and tools
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// 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.
 //
+// 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 Utils : general SALOME's definitions and tools
 //  File   : Utils_ORB_INIT.hxx
 //  Author : Antoine YESSAYAN, EDF
 //  Module : SALOME
 //  $Header$
-
+//
 # if ! defined( __ORB_INIT_HXX__ )
 # define __ORB_INIT_HXX__
 
-# include "CORBA.h" 
+#include <SALOMEconfig.h>
 
-#include "Utils_CommException.hxx"
+#include "SALOME_Utils.hxx"
 
+#include "omniORB4/CORBA.h" 
 
-#if defined UTILS_EXPORTS
-#if defined WIN32
-#define UTILS_EXPORT __declspec( dllexport )
-#else
-#define UTILS_EXPORT
-#endif
-#else
-#if defined WNT
-#define UTILS_EXPORT __declspec( dllimport )
-#else
-#define UTILS_EXPORT
-#endif
+#include "Utils_CommException.hxx"
+
+#ifdef WIN32
+#pragma warning(disable:4251) // Warning DLL Interface ...
+#pragma warning(disable:4290) // Warning Exception ...
 #endif
 
 /*!
@@ -57,19 +51,19 @@ class UTILS_EXPORT ORB_INIT
 {
 
 private :
-       CORBA::ORB_var _orb ;
+        CORBA::ORB_var _orb ;
 
 public :
-       ORB_INIT( void );
-       virtual ~ORB_INIT();
-       CORBA::ORB_var & operator() ( int argc , char **argv ) throw( CommException ) ;
+        ORB_INIT( void );
+        virtual ~ORB_INIT();
+        CORBA::ORB_var & operator() ( int argc , char **argv ) throw( CommException ) ;
 
-       inline CORBA::ORB_var &orb( void );
+        inline CORBA::ORB_var &orb( void );
 } ;
 
 inline CORBA::ORB_var &ORB_INIT::orb( void )
 {
-       return _orb ;
+        return _orb ;
 }
 
 # endif