FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed unsigned int's to unsigned longs so 64 bit build would work.

Browse Source
This commit is contained in:
Don BURNS 2002-10-24 20:49:15 +00:00
parent e1e0547dfd
commit cc122c5bcb
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/osg/MemoryManager.cpp
View File

@ -377,7 +377,7 @@ sMStats m_getMemoryStatistics()
// addresses will be on four-, eight- or even sixteen-byte boundaries. If we didn't do this, the hash index would not have // addresses will be on four-, eight- or even sixteen-byte boundaries. If we didn't do this, the hash index would not have
// very good coverage. // very good coverage.
unsigned int hashIndex = ((unsigned int) reportedAddress >> 4) & (hashSize - 1); unsigned long hashIndex = ((unsigned long) reportedAddress >> 4) & (hashSize - 1);
sAllocUnit *ptr = hashTable[hashIndex]; sAllocUnit *ptr = hashTable[hashIndex];
while(ptr) while(ptr)
{ {
@ -577,10 +577,14 @@ sMStats m_getMemoryStatistics()
sAllocUnit *ptr = hashTable[i]; sAllocUnit *ptr = hashTable[i];
while(ptr) while(ptr)
{ {
#ifdef ARCH64
fprintf(fp, "%06d 0x%08lX 0x%08lX 0x%08lX 0x%08lX 0x%08X %-8s %c %c %s\r\n",
#else
fprintf(fp, "%06d 0x%08X 0x%08X 0x%08X 0x%08X 0x%08X %-8s %c %c %s\r\n", fprintf(fp, "%06d 0x%08X 0x%08X 0x%08X 0x%08X 0x%08X %-8s %c %c %s\r\n",
#endif
ptr->allocationNumber, ptr->allocationNumber,
(unsigned int) ptr->reportedAddress, ptr->reportedSize, (unsigned long) ptr->reportedAddress, ptr->reportedSize,
(unsigned int) ptr->actualAddress, ptr->actualSize, (unsigned long) ptr->actualAddress, ptr->actualSize,
m_calcUnused(ptr), m_calcUnused(ptr),
allocationTypes[ptr->allocationType], allocationTypes[ptr->allocationType],
ptr->breakOnDealloc ? 'Y':'N', ptr->breakOnDealloc ? 'Y':'N',
@ -1126,7 +1130,7 @@ sMStats m_getMemoryStatistics()
// Insert the new allocation into the hash table // Insert the new allocation into the hash table
unsigned int hashIndex = ((unsigned int) au->reportedAddress >> 4) & (hashSize - 1); unsigned long hashIndex = ((unsigned long) au->reportedAddress >> 4) & (hashSize - 1);
if (hashTable[hashIndex]) hashTable[hashIndex]->prev = au; if (hashTable[hashIndex]) hashTable[hashIndex]->prev = au;
au->next = hashTable[hashIndex]; au->next = hashTable[hashIndex];
au->prev = NULL; au->prev = NULL;
@ -1308,7 +1312,7 @@ sMStats m_getMemoryStatistics()
// Remove this allocation unit from the hash table // Remove this allocation unit from the hash table
{ {
unsigned int hashIndex = ((unsigned int) oldReportedAddress >> 4) & (hashSize - 1); unsigned long hashIndex = ((unsigned long) oldReportedAddress >> 4) & (hashSize - 1);
if (hashTable[hashIndex] == au) if (hashTable[hashIndex] == au)
{ {
hashTable[hashIndex] = hashTable[hashIndex]->next; hashTable[hashIndex] = hashTable[hashIndex]->next;
@ -1322,7 +1326,7 @@ sMStats m_getMemoryStatistics()
// Re-insert it back into the hash table // Re-insert it back into the hash table
hashIndex = ((unsigned int) au->reportedAddress >> 4) & (hashSize - 1); hashIndex = ((unsigned long) au->reportedAddress >> 4) & (hashSize - 1);
if (hashTable[hashIndex]) hashTable[hashIndex]->prev = au; if (hashTable[hashIndex]) hashTable[hashIndex]->prev = au;
au->next = hashTable[hashIndex]; au->next = hashTable[hashIndex];
au->prev = NULL; au->prev = NULL;
@ -1446,7 +1450,7 @@ sMStats m_getMemoryStatistics()
// Remove this allocation unit from the hash table // Remove this allocation unit from the hash table
unsigned int hashIndex = ((unsigned int) au->reportedAddress >> 4) & (hashSize - 1); unsigned long hashIndex = ((unsigned long) au->reportedAddress >> 4) & (hashSize - 1);
if (hashTable[hashIndex] == au) if (hashTable[hashIndex] == au)
{ {
hashTable[hashIndex] = au->next; hashTable[hashIndex] = au->next;