|
@@ -96,7 +96,7 @@ show() const {
|
|
|
for (vi = count_sorter.begin(); vi != count_sorter.end(); ++vi) {
|
|
for (vi = count_sorter.begin(); vi != count_sorter.end(); ++vi) {
|
|
|
TypeHandle type = (*vi)._type;
|
|
TypeHandle type = (*vi)._type;
|
|
|
if (type == TypeHandle::none()) {
|
|
if (type == TypeHandle::none()) {
|
|
|
- nout << "undefined type (TypeHandle::none())";
|
|
|
|
|
|
|
+ nout << "unknown";
|
|
|
} else {
|
|
} else {
|
|
|
nout << type;
|
|
nout << type;
|
|
|
}
|
|
}
|
|
@@ -850,12 +850,8 @@ ns_get_pointers_of_type(MemoryUsagePointers &result, TypeHandle type) {
|
|
|
if (info->_freeze_index == _freeze_index &&
|
|
if (info->_freeze_index == _freeze_index &&
|
|
|
info->_ref_ptr != (ReferenceCount *)NULL) {
|
|
info->_ref_ptr != (ReferenceCount *)NULL) {
|
|
|
TypeHandle info_type = info->get_type();
|
|
TypeHandle info_type = info->get_type();
|
|
|
- if (type == TypeHandle::none() &&
|
|
|
|
|
- info_type == TypeHandle::none()) {
|
|
|
|
|
- result.add_entry(info->_ref_ptr, info->_typed_ptr, info_type,
|
|
|
|
|
- now - info->_time);
|
|
|
|
|
- } else if (info_type != TypeHandle::none() &&
|
|
|
|
|
- info_type.is_derived_from(type)) {
|
|
|
|
|
|
|
+ if (info_type != TypeHandle::none() &&
|
|
|
|
|
+ info_type.is_derived_from(type)) {
|
|
|
result.add_entry(info->_ref_ptr, info->_typed_ptr, info_type,
|
|
result.add_entry(info->_ref_ptr, info->_typed_ptr, info_type,
|
|
|
now - info->_time);
|
|
now - info->_time);
|
|
|
}
|
|
}
|