From 7640e428693404f7b7e103b974ea4c5f6770c2ee Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Tue, 23 Jun 2009 19:49:23 +0000 Subject: [PATCH] Switched size_t to int64_t to prevent type mismatch in call to max. llvm-svn: 73988 --- lib/Support/Timer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Support/Timer.cpp b/lib/Support/Timer.cpp index 69f967c7389..8be9444dd3c 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::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); } //===----------------------------------------------------------------------===//