From 43eecb979f7c0b41418c9bc3b626f3d84b7b5ba9 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 27 Aug 2007 17:20:19 +0000
Subject: [PATCH] resolve compilation error (ambiguity between different
 'entries' variables)

---
 panda/src/collide/collisionHandlerFluidPusher.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/panda/src/collide/collisionHandlerFluidPusher.cxx b/panda/src/collide/collisionHandlerFluidPusher.cxx
index ef2500a7d8..63a934228d 100755
--- a/panda/src/collide/collisionHandlerFluidPusher.cxx
+++ b/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;