commit aa6e1cdddae8bd240c5cdc156348f2a42e045a7b
author Elliott Hughes <enh@google.com> Wed Jan 18 19:26:06 2012 -0800
committer Elliott Hughes <enh@google.com> Wed Jan 18 19:26:06 2012 -0800
tree bc0c10ee6e0687273fda49330b5b0713d5eca06e
parent 8add92dcf59568c72c17e9a979948b1a7a0b1264

More Mac build fixes.

Change-Id: Iaf3b974885bc205c89455ae65b1bb09641d114ec

src/debugger.cc

diff --git a/src/debugger.cc b/src/debugger.cc
index 7561560..751efa1 100644
--- a/src/debugger.cc
+++ b/src/debugger.cc
@@ -971,7 +971,7 @@
     static void Callback(void* context, uint16_t slot, uint32_t startAddress, uint32_t endAddress, const char* name, const char* descriptor, const char* signature) {
       DebugCallbackContext* pContext = reinterpret_cast<DebugCallbackContext*>(context);
 
-      VLOG(jdwp) << StringPrintf("    %2d: %d(%d) '%s' '%s' '%s' slot=%d", pContext->variable_count, startAddress, endAddress - startAddress, name, descriptor, signature, slot);
+      VLOG(jdwp) << StringPrintf("    %2zd: %d(%d) '%s' '%s' '%s' slot=%d", pContext->variable_count, startAddress, endAddress - startAddress, name, descriptor, signature, slot);
 
       slot = MangleSlot(slot, name);
 
@@ -2333,7 +2333,7 @@
   while (count--) {
     AllocRecord* record = &recent_allocation_records_[i];
 
-    LOG(INFO) << StringPrintf(" T=%-2d %6d ", record->thin_lock_id, record->byte_count)
+    LOG(INFO) << StringPrintf(" T=%-2d %6zd ", record->thin_lock_id, record->byte_count)
               << PrettyClass(record->type);
 
     for (size_t stack_frame = 0; stack_frame < kMaxAllocRecordStackDepth; ++stack_frame) {

src/dex_verifier.cc

diff --git a/src/dex_verifier.cc b/src/dex_verifier.cc
index deffdc2..752bbd5 100644
--- a/src/dex_verifier.cc
+++ b/src/dex_verifier.cc
@@ -1583,7 +1583,7 @@
   const Instruction* inst = Instruction::At(code_item_->insns_);
   for (size_t dex_pc = 0; dex_pc < code_item_->insns_size_in_code_units_;
       dex_pc += insn_flags_[dex_pc].GetLengthInCodeUnits()) {
-    os << StringPrintf("0x%04x", dex_pc) << ": " << insn_flags_[dex_pc].Dump()
+    os << StringPrintf("0x%04zx", dex_pc) << ": " << insn_flags_[dex_pc].Dump()
         << " " << inst->DumpHex(5) << " " << inst->DumpString(dex_file_) << std::endl;
     RegisterLine* reg_line = reg_table_.GetLine(dex_pc);
     if (reg_line != NULL) {

src/heap.cc

diff --git a/src/heap.cc b/src/heap.cc
index ba52a54..a99c6e5 100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -523,7 +523,7 @@
   // TODO: somehow make the specific GC implementation (here MarkSweep) responsible for logging.
   size_t bytes_freed = initial_size - num_bytes_allocated_;
   bool is_small = (bytes_freed > 0 && bytes_freed < 1024);
-  size_t kib_freed = (bytes_freed > 0 ? std::max(bytes_freed/KB, 1U) : 0);
+  size_t kib_freed = (bytes_freed > 0 ? std::max(bytes_freed/KB, size_t(1U)) : 0);
 
   size_t total = GetTotalMemory();
   size_t percentFree = 100 - static_cast<size_t>(100.0f * float(num_bytes_allocated_) / total);