diff options
| author | Lang Hames <lhames@gmail.com> | 2009-06-23 19:49:23 +0000 |
|---|---|---|
| committer | Lang Hames <lhames@gmail.com> | 2009-06-23 19:49:23 +0000 |
| commit | b2889959c4d446bfd2406d5cf3a0512958328a80 (patch) | |
| tree | 86baa878dfbcf543e0dca760c71437e3a20afea2 /lib/Support/Timer.cpp | |
| parent | a67efd12263eff2ed0f0a89ce905d59a82d0760a (diff) | |
| download | llvm-b2889959c4d446bfd2406d5cf3a0512958328a80.tar.gz llvm-b2889959c4d446bfd2406d5cf3a0512958328a80.tar.bz2 llvm-b2889959c4d446bfd2406d5cf3a0512958328a80.tar.xz | |
Switched size_t to int64_t to prevent type mismatch in call to max.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@73988 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Support/Timer.cpp')
| -rw-r--r-- | lib/Support/Timer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Support/Timer.cpp b/lib/Support/Timer.cpp index 69f967c738..8be9444dd3 100644 --- a/lib/Support/Timer.cpp +++ b/lib/Support/Timer.cpp @@ -182,11 +182,11 @@ void Timer::sum(const Timer &T) { /// currently active timers, which will be printed when the timer group prints /// void Timer::addPeakMemoryMeasurement() { - size_t MemUsed = getMemUsage(); + int64_t MemUsed = getMemUsage(); for (std::vector<Timer*>::iterator I = ActiveTimers->begin(), E = ActiveTimers->end(); I != E; ++I) - (*I)->PeakMem = std::max((*I)->PeakMem, MemUsed-(*I)->PeakMemBase); + (*I)->PeakMem = std::max((*I)->PeakMem, (int64_t)MemUsed-(*I)->PeakMemBase); } //===----------------------------------------------------------------------===// |