summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/ServerI.cpp
diff options
context:
space:
mode:
authorBrent Eagles <brent@zeroc.com>2005-11-15 03:39:38 +0000
committerBrent Eagles <brent@zeroc.com>2005-11-15 03:39:38 +0000
commit543cfbf6e89acf4b329bb60f2a8be55dddc516f0 (patch)
tree23c7a039ce7ab3c6327249693e10023f2143225f /cpp/src/IceGrid/ServerI.cpp
parentadding db.jar to classpath for RPM installs (diff)
downloadice-543cfbf6e89acf4b329bb60f2a8be55dddc516f0.tar.bz2
ice-543cfbf6e89acf4b329bb60f2a8be55dddc516f0.tar.xz
ice-543cfbf6e89acf4b329bb60f2a8be55dddc516f0.zip
fix for loop scoping problem in activate()
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
-rw-r--r--cpp/src/IceGrid/ServerI.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index d5dc1aeaeb4..288d833e48c 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -1015,11 +1015,11 @@ ServerI::activate()
os << ex;
failure = os.str();
}
- for(ServerAdapterDict::iterator p = adpts.begin(); p != adpts.end(); ++p)
+ for(ServerAdapterDict::iterator r = adpts.begin(); r != adpts.end(); ++r)
{
try
{
- p->second->activationFailed(true);
+ r->second->activationFailed(true);
}
catch(const Ice::ObjectNotExistException&)
{