From ac0a33e65c5f61b8c898712933d166653e7dc73c Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 28 Sep 2011 23:00:30 +0000 Subject: [PATCH] cast NULL to pointer type --- panda/src/express/memoryUsage.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panda/src/express/memoryUsage.cxx b/panda/src/express/memoryUsage.cxx index 026f90cf60..328ec84416 100644 --- a/panda/src/express/memoryUsage.cxx +++ b/panda/src/express/memoryUsage.cxx @@ -593,7 +593,7 @@ ns_record_pointer(ReferenceCount *ptr) { // calls by toggling _recursion_protect while we adjust it. _recursion_protect = true; pair insert_result = - _table.insert(Table::value_type((void *)ptr, NULL)); + _table.insert(Table::value_type((void *)ptr, (MemoryInfo *)NULL)); // This shouldn't fail. assert(insert_result.first != _table.end()); @@ -794,7 +794,7 @@ ns_record_void_pointer(void *ptr, size_t size) { _recursion_protect = true; pair insert_result = - _table.insert(Table::value_type((void *)ptr, NULL)); + _table.insert(Table::value_type((void *)ptr, (MemoryInfo *)NULL)); assert(insert_result.first != _table.end());