Browse Source

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

David Rose 18 years ago
parent
commit
43eecb979f
1 changed files with 2 additions and 2 deletions
  1. 2 2
      panda/src/collide/collisionHandlerFluidPusher.cxx

+ 2 - 2
panda/src/collide/collisionHandlerFluidPusher.cxx

@@ -113,7 +113,7 @@ handle_entries() {
   FromEntries::iterator fei;
   for (fei = _from_entries.begin(); fei != _from_entries.end(); ++fei) {
     NodePath from_node_path = fei->first;
-    Entries *entries = &fei->second;
+    Entries *entries_ptr = &fei->second;
     
     Colliders::iterator ci;
     ci = _colliders.find(from_node_path);
@@ -129,7 +129,7 @@ handle_entries() {
       ColliderDef &def = (*ci).second;
       
       // 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
       CollisionSolids SCS;