TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

compiler warnings

Browse Source
This commit is contained in:
David Rose 2011-12-21 01:39:47 +00:00
parent 6e5dd2cc63
commit 9326f5be54
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dtool/src/dtoolbase/memoryHook.I
View File

@ -137,7 +137,7 @@ alloc_to_ptr(void *alloc, size_t size) {
size_t alignment = get_memory_alignment(); size_t alignment = get_memory_alignment();
// Move the allocated pointer up to the next even alignment. // Move the allocated pointer up to the next even alignment.
size_t *root = (size_t *)((((size_t)alloc + alignment - 1) / alignment) * alignment); size_t *root = (size_t *)((((size_t)alloc + alignment - 1) / alignment) * alignment);
assert(alloc <= root && (char *)root - (char *)alloc < alignment); assert(alloc <= root && (size_t)((char *)root - (char *)alloc) < alignment);
root[0] = size; root[0] = size;
root[1] = (size_t)alloc; // Save the pointer we originally allocated. root[1] = (size_t)alloc; // Save the pointer we originally allocated.
return (void *)((char *)root + _header_reserved_bytes); return (void *)((char *)root + _header_reserved_bytes);
@ -163,7 +163,7 @@ ptr_to_alloc(void *ptr, size_t &size) {
size_t *root = (size_t *)((char *)ptr - _header_reserved_bytes); size_t *root = (size_t *)((char *)ptr - _header_reserved_bytes);
size = root[0]; size = root[0];
void *alloc = (void *)root[1]; // Get the pointer we originally allocated. void *alloc = (void *)root[1]; // Get the pointer we originally allocated.
assert(alloc <= root && (char *)root - (char *)alloc < get_memory_alignment()); assert(alloc <= root && (size_t)((char *)root - (char *)alloc) < get_memory_alignment());
return alloc; return alloc;
#elif defined(DO_MEMORY_USAGE) #elif defined(DO_MEMORY_USAGE)
size_t *root = (size_t *)((char *)ptr - _header_reserved_bytes); size_t *root = (size_t *)((char *)ptr - _header_reserved_bytes);