correct previous integration (Porting to Python 2.6)

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

diff --git a/src/Utils/Utils_Timer.hxx b/src/Utils/Utils_Timer.hxx
index 603323e4d140b84fcd72b8251db825bcc15f9815..96f33205e208e94a6fde4dccf65b58d86e1a70fc 100644 (file)
--- a/src/Utils/Utils_Timer.hxx
+++ b/src/Utils/Utils_Timer.hxx
@@ -1,33 +1,34 @@
-//  SALOME Utils : general SALOME's definitions and tools
+//  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  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//  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_Timer.hxx
 //  Module : SALOME
+//
+#include "SALOME_Utils.hxx"
 
 #include <stdlib.h>
 #include <time.h>
 
-#ifndef WNT
+#ifndef WIN32
 # include <sys/times.h>
 # include <sys/time.h>
 # include <unistd.h>
@@ -38,7 +39,7 @@
 #define _POSIX_
 #endif
 
-class Utils_Timer {
+class UTILS_EXPORT Utils_Timer {
  public:
   Utils_Timer();
   virtual ~Utils_Timer();
@@ -51,7 +52,7 @@ class Utils_Timer {
   double Cumul_user;
   double Cumul_sys;
   bool Stopped;
-#ifndef WNT
+#ifndef WIN32
   tms *RefToCurrentTMS, *RefToInitialTMS;
   timeval *RefToCurrentTimeB, *RefToInitialTimeB;
 #else