Merge branch 'master' into GammaIndex3D

[clitk.git] / common / clitkTimer.h

diff --git a/common/clitkTimer.h b/common/clitkTimer.h
index 2134f41ba865390e3921ff06b1d3133cf84a478b..725a3b2bd506dbce7b2c7e1bfbb8de70e99da37f 100644 (file)
--- a/common/clitkTimer.h
+++ b/common/clitkTimer.h
@@ -3,7 +3,7 @@
 
   Authors belong to: 
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,25 +14,16 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #ifndef CLITKTIMER_H
 #define CLITKTIMER_H
-/**
-   ===================================================================
-   * @file   clitkTimer.h
-   * @author David Sarrut <David.Sarrut@creatis.insa-lyon.fr>
-   * @date   18 Jul 2007 16:26:08
 
-   * @brief  
-
-   ===================================================================*/
-
-#include "clitkCommon.h"
+//#include "clitkCommon.h"
 #include <ctime> 
 #if defined(unix) || defined(__APPLE__)
 #  include <sys/time.h>
 #  include <sys/resource.h>
-#elif defined(WIN32)
+#elif defined(_WIN32)
 #  include <windows.h>
 #endif
 #include <iostream>
@@ -62,7 +53,7 @@ namespace clitk {
 #if defined(unix) || defined(__APPLE__)
     rusage mBegin; 
     rusage mEnd;
-#elif defined(WIN32)
+#elif defined(_WIN32)
     unsigned __int64 mBegin;
     unsigned __int64 mEnd;
     unsigned __int64 mFrequency;