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

fix unnamed type bug

Browse Source
This commit is contained in:
David Rose 2001-06-06 14:17:03 +00:00
parent aca639e936
commit a5eff41ecc
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dtool/src/interrogate/interrogateBuilder.cxx
View File

@ -1777,6 +1777,11 @@ get_type(CPPType *type, bool global) {
if (tni != _types_by_name.end()) { if (tni != _types_by_name.end()) {
// It's already here, so update the global flag. // It's already here, so update the global flag.
index = (*tni).second; index = (*tni).second;
if (index == 0) {
// This is an invalid type; we don't know anything about it.
return 0;
}
InterrogateType &itype = InterrogateDatabase::get_ptr()->update_type(index); InterrogateType &itype = InterrogateDatabase::get_ptr()->update_type(index);
if (global) { if (global) {
itype._flags |= InterrogateType::F_global; itype._flags |= InterrogateType::F_global;

3
dtool/src/interrogatedb/interrogateDatabase.cxx
View File

@ -501,6 +501,7 @@ get_next_index() {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void InterrogateDatabase:: void InterrogateDatabase::
add_type(TypeIndex index, const InterrogateType &type) { add_type(TypeIndex index, const InterrogateType &type) {
assert(index != 0);
bool inserted = bool inserted =
_type_map.insert(TypeMap::value_type(index, type)).second; _type_map.insert(TypeMap::value_type(index, type)).second;
@ -593,6 +594,7 @@ add_element(ElementIndex index, const InterrogateElement &element) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
InterrogateType &InterrogateDatabase:: InterrogateType &InterrogateDatabase::
update_type(TypeIndex type) { update_type(TypeIndex type) {
assert(type != 0);
check_latest(); check_latest();
return _type_map[type]; return _type_map[type];
} }
@ -697,6 +699,7 @@ remap_indices(int first_index, IndexRemapper &remap) {
TypeMap new_type_map; TypeMap new_type_map;
TypeMap::iterator ti; TypeMap::iterator ti;
for (ti = _type_map.begin(); ti != _type_map.end(); ++ti) { for (ti = _type_map.begin(); ti != _type_map.end(); ++ti) {
assert((*ti).first != 0);
remap.add_mapping((*ti).first, first_index); remap.add_mapping((*ti).first, first_index);
new_type_map[first_index] = (*ti).second; new_type_map[first_index] = (*ti).second;
first_index++; first_index++;