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

cast NULL to pointer type

Browse Source
This commit is contained in:
David Rose 2011-09-28 23:00:30 +00:00
parent 303b51198e
commit ac0a33e65c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/express/memoryUsage.cxx
View File

@ -593,7 +593,7 @@ ns_record_pointer(ReferenceCount *ptr) {
// calls by toggling _recursion_protect while we adjust it. // calls by toggling _recursion_protect while we adjust it.
_recursion_protect = true; _recursion_protect = true;
pair<Table::iterator, bool> insert_result = pair<Table::iterator, bool> insert_result =
_table.insert(Table::value_type((void *)ptr, NULL)); _table.insert(Table::value_type((void *)ptr, (MemoryInfo *)NULL));
// This shouldn't fail. // This shouldn't fail.
assert(insert_result.first != _table.end()); assert(insert_result.first != _table.end());
@ -794,7 +794,7 @@ ns_record_void_pointer(void *ptr, size_t size) {
_recursion_protect = true; _recursion_protect = true;
pair<Table::iterator, bool> insert_result = pair<Table::iterator, bool> 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()); assert(insert_result.first != _table.end());