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

rename set -> this_set

Browse Source
This commit is contained in:
David Rose 2007-03-27 21:14:42 +00:00
parent babebe7c5c
commit f487846371
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dtool/src/dtoolbase/typeRegistry.cxx
View File

@ -728,9 +728,9 @@ find_type_by_id(int id) const {
// Access: Private
///////////////////////////////////////////////////////////////////
extern "C" int
get_best_parent_from_Set(int id, const std::set<int> &set) {
get_best_parent_from_Set(int id, const std::set<int> &this_set) {
// most common case..
if (set.find(id) != set.end()) {
if (this_set.find(id) != this_set.end()) {
return id;
}
@ -739,6 +739,6 @@ get_best_parent_from_Set(int id, const std::set<int> &set) {
return -1;
}
return th.get_best_parent_from_Set(set);
return th.get_best_parent_from_Set(this_set);
}

2
dtool/src/dtoolbase/typeRegistry.h
View File

@ -119,7 +119,7 @@ private:
///////////////////////////////////////////
// Helper function to allow for "C" interaction into the type system
extern "C" EXPCL_DTOOL int get_best_parent_from_Set(int id, const std::set<int> &set);
extern "C" EXPCL_DTOOL int get_best_parent_from_Set(int id, const std::set<int> &this_set);
#include "typeRegistry.I"