summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ThreadPool.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2001-08-19 16:12:56 +0000
committerMarc Laukien <marc@zeroc.com>2001-08-19 16:12:56 +0000
commit05dd3feba5b858949d0d078effb406c85dda1d90 (patch)
tree1edaee86dfd436e488dbdcbaaee2a41facc1e35f /cpp/src/Ice/ThreadPool.cpp
parentremoved file (diff)
downloadice-05dd3feba5b858949d0d078effb406c85dda1d90.tar.bz2
ice-05dd3feba5b858949d0d078effb406c85dda1d90.tar.xz
ice-05dd3feba5b858949d0d078effb406c85dda1d90.zip
--Ice...
Diffstat (limited to 'cpp/src/Ice/ThreadPool.cpp')
-rw-r--r--cpp/src/Ice/ThreadPool.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index 4484d8ea99d..2f34c72b5d9 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -236,8 +236,7 @@ IceInternal::ThreadPool::run()
//
// New handlers have been added
//
- vector<pair<int, EventHandlerPtr> >::iterator p;
- for (p = _adds.begin(); p != _adds.end(); ++p)
+ for (vector<pair<int, EventHandlerPtr> >::iterator p = _adds.begin(); p != _adds.end(); ++p)
{
_handlers.insert(*p);
FD_SET(p->first, &_fdSet);
@@ -252,16 +251,14 @@ IceInternal::ThreadPool::run()
//
// Handlers are permanently removed
//
- vector<int>::iterator p;
- for (p = _removes.begin(); p != _removes.end(); ++p)
+ for (vector<int>::iterator p = _removes.begin(); p != _removes.end(); ++p)
{
- std::map<int, EventHandlerPtr>::iterator q =
- _handlers.find(*p);
+ std::map<int, EventHandlerPtr>::iterator q = _handlers.find(*p);
assert(q != _handlers.end());
#ifdef WIN32
- FD_CLR(static_cast<u_int>(*p), &_fdSet);
+ FD_CLR(static_cast<u_int>(*p), &_fdSet);
#else
- FD_CLR(*p, &_fdSet);
+ FD_CLR(*p, &_fdSet);
#endif
q->second->finished();
if (q->second->server())