From: Lang Hames <lhames@gmail.com>
Date: Tue, 23 Jun 2009 19:49:23 +0000 (+0000)
Subject: Switched size_t to int64_t to prevent type mismatch in call to max.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=b2889959c4d446bfd2406d5cf3a0512958328a80;p=oota-llvm.git

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
---

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<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);
 }
 
 //===----------------------------------------------------------------------===//