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

fix track-memory-usage

Browse Source
This commit is contained in:
David Rose 2007-05-09 22:07:29 +00:00
parent 9f89b56c0b
commit 7d12427481
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,7 +118,7 @@ determine_dynamic_type() {
_dynamic_type = _static_type; _dynamic_type = _static_type;
_flags &= ~F_reconsider_dynamic_type; _flags &= ~F_reconsider_dynamic_type;
nassert_raise("Unregistered type."); //nassert_raise("Unregistered type");
return; return;
} }
@ -133,7 +133,7 @@ determine_dynamic_type() {
} }
} else { } else {
express_cat.error() express_cat.warning()
<< "Pointer " << (void *)_ref_ptr << " previously indicated as type " << "Pointer " << (void *)_ref_ptr << " previously indicated as type "
<< orig_type << " is now type " << got_type << "!\n"; << orig_type << " is now type " << got_type << "!\n";
} }

4
panda/src/putil/copyOnWriteObject.I
View File

@ -145,9 +145,9 @@ init_type() {
TypeHandle base_type = register_dynamic_type(base_name); TypeHandle base_type = register_dynamic_type(base_name);
CachedTypedWritableReferenceCount::init_type(); CopyOnWriteObject::init_type();
_type_handle = _type_handle =
register_dynamic_type("CopyOnWriteObj<" + base_name + ">", register_dynamic_type("CopyOnWriteObj<" + base_name + ">",
base_type, base_type,
CachedTypedWritableReferenceCount::get_class_type()); CopyOnWriteObject::get_class_type());
} }