aboutsummaryrefslogtreecommitdiff
path: root/src/timers.cc
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-10-08 02:12:40 -0600
committerEric Fiselier <eric@efcs.ca>2016-10-08 02:12:40 -0600
commit57a22c69b382b3f010ec4042c9574ea3fd8dcbb4 (patch)
treef181c6023c232e2a8e69b49759e0b34d5f52740c /src/timers.cc
parent721c9224b96ad6b6559bf1695ec633a35e69027c (diff)
downloadgoogle-benchmark-57a22c69b382b3f010ec4042c9574ea3fd8dcbb4.tar.gz
Fix typo in timer.cc that caused negative CPU times on OS X. Fixes #293
Diffstat (limited to 'src/timers.cc')
-rw-r--r--src/timers.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/timers.cc b/src/timers.cc
index bfe06be..fadc08f 100644
--- a/src/timers.cc
+++ b/src/timers.cc
@@ -83,7 +83,7 @@ double MakeTime(thread_basic_info_data_t const& info) {
return (static_cast<double>(info.user_time.seconds) +
static_cast<double>(info.user_time.microseconds) * 1e-6 +
static_cast<double>(info.system_time.seconds) +
- static_cast<double>(info.user_time.microseconds) * 1e-6);
+ static_cast<double>(info.system_time.microseconds) * 1e-6);
}
#endif
#if defined(CLOCK_PROCESS_CPUTIME_ID) || defined(CLOCK_THREAD_CPUTIME_ID)