summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Support/Timer.cpp
diff options
context:
space:
mode:
authorLang Hames <lhames@gmail.com>2009-06-23 19:49:23 +0000
committerLang Hames <lhames@gmail.com>2009-06-23 19:49:23 +0000
commitc547bad3ffc7d4a2681b33093031b4b3f68d020d (patch)
treed2bb0b2062a2958d36efa8cd3b943bfdc8a71233 /llvm/lib/Support/Timer.cpp
parent4983e4550e878ce6e90e42b5f2cf05c7ab728aac (diff)
downloadbcm5719-llvm-c547bad3ffc7d4a2681b33093031b4b3f68d020d.tar.gz
bcm5719-llvm-c547bad3ffc7d4a2681b33093031b4b3f68d020d.zip
Switched size_t to int64_t to prevent type mismatch in call to max.
llvm-svn: 73988
Diffstat (limited to 'llvm/lib/Support/Timer.cpp')
-rw-r--r--llvm/lib/Support/Timer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Support/Timer.cpp b/llvm/lib/Support/Timer.cpp
index 69f967c7389..8be9444dd3c 100644
--- a/llvm/lib/Support/Timer.cpp
+++ b/llvm/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);
}
//===----------------------------------------------------------------------===//
OpenPOWER on IntegriCloud