Browse Source

rename set -> this_set

David Rose 19 years ago
parent
commit
f487846371
2 changed files with 4 additions and 4 deletions
  1. 3 3
      dtool/src/dtoolbase/typeRegistry.cxx
  2. 1 1
      dtool/src/dtoolbase/typeRegistry.h

+ 3 - 3
dtool/src/dtoolbase/typeRegistry.cxx

@@ -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);
 }
 

+ 1 - 1
dtool/src/dtoolbase/typeRegistry.h

@@ -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"