Changeset 10052 for ps

Timestamp:

08/21/11 15:10:44 (13 years ago)

Author:

philip

Message:

Fix build

Location:

ps/trunk/source/lib

Files:

• allocators/pool.h (modified) (2 diffs)
• sysdep/os/unix/uvm.cpp (modified) (1 diff)

ps/trunk/source/lib/allocators/pool.h

@@ -64 +64 @@
         if(p)
         {
-            ASSERT(Contains(p));
+            ASSERT(Contains((uintptr_t)p));
             return (T*)p;
         }
@@ -73 +73 @@
     void Deallocate(T* p)
     {
-        ASSERT(Contains(p));
+        ASSERT(Contains((uintptr_t)p));
         mem_freelist_AddToFront(freelist, p);
     }

ps/trunk/source/lib/sysdep/os/unix/uvm.cpp

@@ -75 +75 @@
 }
 
-bool Decommit(void* p, size_t size)
+bool Decommit(uintptr_t address, size_t size)
 {
     errno = 0;
-    if(mmap(p, size, PROT_NONE, mmap_flags|MAP_NORESERVE|MAP_FIXED, -1, 0) == MAP_FAILED)
+    if(mmap((void*)address, size, PROT_NONE, mmap_flags|MAP_NORESERVE|MAP_FIXED, -1, 0) == MAP_FAILED)
         return false;
     return true;