[llvm-commits] CVS: poolalloc/runtime/FL2Allocator/FreeListAllocator.cpp

[John Criswell]

Changes in directory poolalloc/runtime/FL2Allocator:

FreeListAllocator.cpp updated: 1.29 -> 1.30

---
Log message:

Fixed warnings and errors on Sparc by making the code generate 64 bit
integers when on Solaris.



---
Diffs of the changes:  (+4 -3)

Index: poolalloc/runtime/FL2Allocator/FreeListAllocator.cpp
diff -u poolalloc/runtime/FL2Allocator/FreeListAllocator.cpp:1.29 poolalloc/runtime/FL2Allocator/FreeListAllocator.cpp:1.30
--- poolalloc/runtime/FL2Allocator/FreeListAllocator.cpp:1.29	Wed Nov 10 23:46:41 2004
+++ poolalloc/runtime/FL2Allocator/FreeListAllocator.cpp	Fri Nov 12 14:09:43 2004
@@ -19,6 +19,7 @@
 #include <string.h>
 
 typedef long intptr_t;
+typedef unsigned long uintptr_t;
 
 // Performance tweaking macros.
 #define INITIAL_SLAB_SIZE 4096
@@ -65,7 +66,7 @@
   for (unsigned i = 0; i != NumLivePools; ++i)
     if (PoolIDs[i].PD == PD)
       return PoolIDs[i].ID;
-  fprintf(stderr, "INVALID/UNKNOWN POOL DESCRIPTOR: 0x%X\n", (unsigned)PD);
+  fprintf(stderr, "INVALID/UNKNOWN POOL DESCRIPTOR: 0x%lX\n", (unsigned long)PD);
   return 0;
 }
 
@@ -77,7 +78,7 @@
       --NumLivePools;
       return PN;
     }
-  fprintf(stderr, "INVALID/UNKNOWN POOL DESCRIPTOR: 0x%X\n", (unsigned)PD);
+  fprintf(stderr, "INVALID/UNKNOWN POOL DESCRIPTOR: 0x%lX\n", (unsigned long)PD);
   return 0;
 }
 
@@ -279,7 +280,7 @@
 
   if (NumBytes < 1) NumBytes = 1;
 
-  unsigned Alignment;
+  uintptr_t Alignment;
   char *BumpPtr, *EndPtr;
   Alignment = Pool->Alignment-1;
   BumpPtr = (char*)Pool->ObjFreeList; // Get our bump pointer.