Merge branch 'master' of https://github.com/open-vv/vv

[clitk.git] / common / clitkTimer.cxx

diff --git a/common/clitkTimer.cxx b/common/clitkTimer.cxx
index d6987fa96ab3db12335ece3d54646958e7bf03b1..329ca13f04272d44104a3f0926e54e3b0e5b0aa8 100644 (file)
--- a/common/clitkTimer.cxx
+++ b/common/clitkTimer.cxx
@@ -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,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #ifndef CLITKTIMER_CXX
 #define CLITKTIMER_CXX
 /**
@@ -37,7 +37,7 @@
 clitk::Timer::Timer()
 {
   Reset();
-#if defined(WIN32)
+#if defined(_WIN32)
   QueryPerformanceFrequency((LARGE_INTEGER*)&mFrequency);
 #endif
 }
@@ -48,7 +48,7 @@ void clitk::Timer::Start()
 {
 #if defined(unix) || defined(__APPLE__)
   getrusage(RUSAGE_SELF, &mBegin);
-#elif defined(WIN32)
+#elif defined(_WIN32)
   QueryPerformanceCounter((LARGE_INTEGER*)&mBegin);
 #endif
   mNumberOfCall++;
@@ -64,13 +64,15 @@ void clitk::Timer::Stop(bool accumulate)
     mElapsed += (mEnd.ru_utime.tv_usec - mBegin.ru_utime.tv_usec)+
                 (mEnd.ru_utime.tv_sec - mBegin.ru_utime.tv_sec)*1000000;
   }
-#elif defined(WIN32)
+  else
+#elif defined(_WIN32)
   QueryPerformanceCounter((LARGE_INTEGER*)&mEnd);
   if (accumulate) {
     mElapsed += ((mEnd-mBegin)*1000000)/(long double)mFrequency;
   }
+  else
 #endif
-  else {
+  {
     mNumberOfCall--;
   }
 }
@@ -99,7 +101,7 @@ void clitk::Timer::Print(std::ostream & os) const
 //====================================================================
 void clitk::Timer::Print(std::string text, std::ostream & os) const
 {
-  os << text;
+  os << text.c_str();
   Print(os);
 }
 //====================================================================
@@ -114,4 +116,3 @@ void clitk::Timer::Reset()
 
 // #endif // If UNIX
 #endif /* end #define CLITKTIMER_CXX */
-