Browse Source

compiler warning

David Rose 18 years ago
parent
commit
df4cf52a77
2 changed files with 2 additions and 2 deletions
  1. 1 1
      dtool/src/dtoolbase/memoryHook.I
  2. 1 1
      dtool/src/dtoolbase/memoryHook.cxx

+ 1 - 1
dtool/src/dtoolbase/memoryHook.I

@@ -41,7 +41,7 @@ inc_heap(size_t size) {
 INLINE void MemoryHook::
 dec_heap(size_t size) {
 #ifdef DO_MEMORY_USAGE
-  assert(size <= _requested_heap_size);
+  assert((int)size <= _requested_heap_size);
   AtomicAdjust::add(_requested_heap_size, -(PN_int32)size);
 #endif  // DO_MEMORY_USAGE
 }

+ 1 - 1
dtool/src/dtoolbase/memoryHook.cxx

@@ -296,7 +296,7 @@ heap_free_array(void *ptr) {
 bool MemoryHook::
 heap_trim(size_t pad) {
 #if defined(USE_MEMORY_DLMALLOC) || (defined(USE_MEMORY_PTMALLOC2) && !defined(linux))
-  return dlmalloc_trim(pad);
+  return (dlmalloc_trim(pad) != 0);
 #else
   // Since malloc_trim() isn't standard C, we can't be sure it exists
   // on a given platform.