[Author: thomasvl]

Pile of fixes for trunk version of clang.

R=dmaclach
DELTA=59  (26 added, 0 deleted, 33 changed)

1 files changed, 6 insertions, 6 deletions

diff --git a/Foundation/GTMStackTrace.m b/Foundation/GTMStackTrace.m
index 8019867..8b482e6 100644
--- a/Foundation/GTMStackTrace.m
+++ b/Foundation/GTMStackTrace.m
@@ -172,24 +172,24 @@ static NSString *GTMStackTraceFromAddressDescriptors(struct GTMAddressDescriptor
       fileName = @"??";
     }
     if (descs[i].class_name) {
-      [trace appendFormat:@"#%-2u %-35s %0*p %s[%s %s]",
+      [trace appendFormat:@"#%-2u %-35s %0*lX %s[%s %s]",
        i,
        [fileName UTF8String],
        // sizeof(void*) * 2 is the length of the hex address (32 vs 64) and + 2 
        // for the 0x prefix
-       sizeof(void *) * 2 + 2, 
-       descs[i].address, 
+       (int)(sizeof(void *) * 2 + 2),
+       (unsigned long)descs[i].address, 
        (descs[i].is_class_method ? "+" : "-"),
        descs[i].class_name,
        (descs[i].symbol ? descs[i].symbol : "??")];
     } else {
-      [trace appendFormat:@"#%-2u %-35s %0*p %s()",
+      [trace appendFormat:@"#%-2u %-35s %0*lX %s()",
        i, 
        [fileName UTF8String],
        // sizeof(void*) * 2 is the length of the hex address (32 vs 64) and + 2 
        // for the 0x prefix
-       sizeof(void *) * 2 + 2,
-       descs[i].address,
+       (int)(sizeof(void *) * 2 + 2),
+       (unsigned long)descs[i].address,
        (descs[i].symbol ? descs[i].symbol : "??")];
     }
   }