diff options
| author | Claus Klein <claus.klein@arcormail.de> | 2012-07-27 20:06:03 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2012-07-27 20:06:03 (GMT) |
| commit | 6a410a3d5b652f12e6f755c3bc1d0fc52b54d207 (patch) | |
| tree | 1b619aed56e371196608720ed11ebaaa5929208c /src | |
| parent | 77a869f63828a297f35dd39d95ad96ff8ea38a88 (diff) | |
| download | Ninja-6a410a3d5b652f12e6f755c3bc1d0fc52b54d207.zip Ninja-6a410a3d5b652f12e6f755c3bc1d0fc52b54d207.tar.gz Ninja-6a410a3d5b652f12e6f755c3bc1d0fc52b54d207.tar.bz2 | |
fix error and prevent warning in GetTimeMillis()
Diffstat (limited to 'src')
| -rw-r--r-- | src/metrics.cc | 2 | ||||
| -rw-r--r-- | src/metrics.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/metrics.cc b/src/metrics.cc index 8407717..ca4f97a 100644 --- a/src/metrics.cc +++ b/src/metrics.cc @@ -120,6 +120,6 @@ uint64_t Stopwatch::Now() const { } int64_t GetTimeMillis() { - return 1000 * TimerToMicros(HighResTimer()); + return TimerToMicros(HighResTimer()) / 1000; } diff --git a/src/metrics.h b/src/metrics.h index dae6b9f..f5ac0de 100644 --- a/src/metrics.h +++ b/src/metrics.h @@ -72,7 +72,7 @@ public: Stopwatch() : started_(0) {} /// Seconds since Restart() call - double Elapsed() const { return 1e-6 * (Now() - started_); } + double Elapsed() const { return 1e-6 * static_cast<double>(Now() - started_); } void Restart() { started_ = Now(); } |