Changeset 32716

Timestamp:

Nov 18, 2011, 4:39:24 PM (15 years ago)

Author:

eugene

Message:

with a volatile lastMemBlockAllocated, need to cast away the volatile when assigning to other memblocks

File:

• trunk/psLib/src/sys/psMemory.c (modified) (5 diffs)

trunk/psLib/src/sys/psMemory.c

@@ -680 +680 @@
         lastMemBlockAllocated->previousBlock = memBlock;
     }
-    memBlock->nextBlock = lastMemBlockAllocated;
+    memBlock->nextBlock = (psMemBlock *) lastMemBlockAllocated;
     lastMemBlockAllocated = memBlock;
 
@@ -910 +910 @@
     psS32 nleak = 0;
     psS32 j = 0;
-    psMemBlock *topBlock = lastMemBlockAllocated;
+    psMemBlock *topBlock = (psMemBlock *) lastMemBlockAllocated;
 
     // XXX move this elsewhere?
@@ -1297 +1297 @@
 
     psS32 nbad = 0;               // number of bad blocks
-    for (psMemBlock *memBlock = lastMemBlockAllocated; memBlock != NULL; memBlock = memBlock->nextBlock) {
+    for (psMemBlock *memBlock = (psMemBlock *) lastMemBlockAllocated; memBlock != NULL; memBlock = memBlock->nextBlock) {
         if (isBadMemBlock(output, memBlock, __FILE__, __LINE__, __func__)) {
             nbad++;
@@ -1328 +1328 @@
 
     // loop through the linked list of memBlocks looking for a matching pointer
-    for (psMemBlock *memBlock = lastMemBlockAllocated; memBlock != NULL; memBlock = memBlock->nextBlock) {
+    for (psMemBlock *memBlock = (psMemBlock *) lastMemBlockAllocated; memBlock != NULL; memBlock = memBlock->nextBlock) {
         if (memBlock == addr) {
             // we found the memBlock
@@ -1379 +1379 @@
     size_t alloc = 0, persist = 0;
     size_t nalloc = 0, npersist = 0;
-    for (psMemBlock* ptr = lastMemBlockAllocated; ptr != NULL; ptr = ptr->nextBlock) {
+    for (psMemBlock* ptr = (psMemBlock *) lastMemBlockAllocated; ptr != NULL; ptr = ptr->nextBlock) {
         assert (ptr->refCounter > 0);