bos #26457 Factorization of ORB initialization

[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 69aed10fd505a76a642145cc02bd000a95b23434..c3c10046c4c1d8f485579ab39e9bf0a7c4213a99 100644 (file)
--- a/src/Utils/Utils_ORB_INIT.hxx
+++ b/src/Utils/Utils_ORB_INIT.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// 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
@@ -6,7 +6,7 @@
 // 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,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -37,9 +37,9 @@
 
 #include "Utils_CommException.hxx"
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning(disable:4251) // Warning DLL Interface ...
-#pragma warning(disable:4290) // Warning Exception ...
+//#pragma warning(disable:4290) // Warning Exception ...
 #endif
 
 /*!
@@ -56,7 +56,8 @@ private :
 public :
         ORB_INIT( void );
         virtual ~ORB_INIT();
-        CORBA::ORB_var & operator() ( int argc , char **argv ) throw( CommException ) ;
+        void explicit_destroy();
+        CORBA::ORB_var & operator() ();
 
         inline CORBA::ORB_var &orb( void );
 } ;