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

resolve compilation error (ambiguity between different 'entries' variables)

Browse Source
This commit is contained in:
David Rose 2007-08-27 17:20:19 +00:00
parent 5c327bdeff
commit 43eecb979f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/collide/collisionHandlerFluidPusher.cxx
View File

@ -113,7 +113,7 @@ handle_entries() {
FromEntries::iterator fei; FromEntries::iterator fei;
for (fei = _from_entries.begin(); fei != _from_entries.end(); ++fei) { for (fei = _from_entries.begin(); fei != _from_entries.end(); ++fei) {
NodePath from_node_path = fei->first; NodePath from_node_path = fei->first;
Entries *entries = &fei->second; Entries *entries_ptr = &fei->second;
Colliders::iterator ci; Colliders::iterator ci;
ci = _colliders.find(from_node_path); ci = _colliders.find(from_node_path);
@ -129,7 +129,7 @@ handle_entries() {
ColliderDef &def = (*ci).second; ColliderDef &def = (*ci).second;
// extract the collision entries into a vector that we can safely modify // extract the collision entries into a vector that we can safely modify
Entries entries(*entries); Entries entries(*entries_ptr);
// extract out the initial set of collision solids // extract out the initial set of collision solids
CollisionSolids SCS; CollisionSolids SCS;