X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkTimer.h;h=0021fa75afc9b812e7e31c59fe92afb0e84f3c91;hb=e1098dccba022441144bfc1c44a2b58db7dde34e;hp=5f27490f6613a475dbbef36088db9baef3607840;hpb=0b7c9b1e1215634b02cbd38d4e4ba101d6111ba8;p=clitk.git diff --git a/common/clitkTimer.h b/common/clitkTimer.h index 5f27490..0021fa7 100644 --- 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,22 +14,13 @@ - 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 - * @date 18 Jul 2007 16:26:08 - * @brief - - ===================================================================*/ - -#include "clitkCommon.h" +//#include "clitkCommon.h" #include -#if defined(unix) +#if defined(unix) || defined(__APPLE__) # include # include #elif defined(WIN32) @@ -59,7 +50,7 @@ namespace clitk { //==================================================================== protected: -#if defined(unix) +#if defined(unix) || defined(__APPLE__) rusage mBegin; rusage mEnd; #elif defined(WIN32)