Mercurial > hg > svcore

diff base/Profiler.cpp @ 1221:a1b97df9962e 3.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch msvc2015_64
author Chris Cannam
date Thu, 20 Oct 2016 11:16:22 +0100
parents c811991a5efa
children 48e9f538e6e9
line wrap: on
line diff
--- a/base/Profiler.cpp	Tue Oct 18 14:03:35 2016 +0100
+++ b/base/Profiler.cpp	Thu Oct 20 11:16:22 2016 +0100
@@ -47,15 +47,11 @@
     dump();
 }
 
+#ifndef NO_TIMING
 void Profiles::accumulate(
-#ifndef NO_TIMING
     const char* id, clock_t time, RealTime rt
-#else
-    const char*, clock_t, RealTime
-#endif
 )
 {
-#ifndef NO_TIMING    
     ProfilePair &pair(m_profiles[id]);
     ++pair.first;
     pair.second.first += time;
@@ -72,8 +68,8 @@
     if (rt > worstPair.second) {
         worstPair.second = rt;
     }
+}
 #endif
-}
 
 void Profiles::dump() const
 {