untabify

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

diff --git a/src/Utils/Utils_ExceptHandlers.hxx b/src/Utils/Utils_ExceptHandlers.hxx
index 7996ae9221bb70665e17e3c354a4d7c1eca4f0dd..f4abb27a3eaf99e6c6a7484f24491064a70db066 100644 (file)
--- a/src/Utils/Utils_ExceptHandlers.hxx
+++ b/src/Utils/Utils_ExceptHandlers.hxx
@@ -1,12 +1,13 @@
-//  KERNEL Utils : common utils for KERNEL
-//  Copyright (C) 2003  CEA
+//  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.
 //
-
 //  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
@@ -16,38 +17,50 @@
 //  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.org
-//
-//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+//  KERNEL Utils : common utils for KERNEL
 //  File   : Utils_ExceptHandlers.hxx
 //  Author : Oksana Tchebanova
 //  Module : KERNEL
 //  $Header:
-
-
+//
 #ifndef Utils_ExceptHandlers_HeaderFile
 #define Utils_ExceptHandlers_HeaderFile
 
+#include "SALOME_Utils.hxx"
+
 #include <stdexcept>
 
 typedef void (*PVF)();
 
-class Unexpect { //save / retrieve unexpected exceptions treatment
+class UTILS_EXPORT Unexpect { //save / retrieve unexpected exceptions treatment
   PVF old;
   public :
+#ifndef WIN32
     Unexpect( PVF f ) 
       { old = std::set_unexpected(f); }
   ~Unexpect() { std::set_unexpected(old); }
+#else
+    Unexpect( PVF f ) 
+      { old = ::set_unexpected(f); }
+  ~Unexpect() { ::set_unexpected(old); }
+#endif
 };
 
-class Terminate {//save / retrieve terminate function
+class UTILS_EXPORT Terminate {//save / retrieve terminate function
   
   PVF old;
   public :
+#ifndef WIN32
     Terminate( PVF f ) 
       { old = std::set_terminate(f); }
   ~Terminate() { std::set_terminate(old); }
+#else
+    Terminate( PVF f ) 
+      { old = ::set_terminate(f); }
+  ~Terminate() { ::set_terminate(old); }
+#endif
 };
 
 #define UNEXPECT_CATCH(FuncName, ExceptionConstructor) \
@@ -69,7 +82,7 @@ inline void FuncName () {\
 
 
 //Definitions :
-extern void SalomeException();
-extern void SALOME_SalomeException();
+UTILS_EXPORT extern void SalomeException();
+UTILS_EXPORT extern void SALOME_SalomeException();
 
 #endif