summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ThreadPool.cpp
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2007-02-04 01:09:07 +0000
committerMatthew Newhook <matthew@zeroc.com>2007-02-04 01:09:07 +0000
commit4bfa96c569e6ff0e57e3ead8b551246c5851ac65 (patch)
tree1190f8467f33cfc7d0e35db4bea373e158ce181b /cpp/src/Ice/ThreadPool.cpp
parentChanged version. (diff)
downloadice-4bfa96c569e6ff0e57e3ead8b551246c5851ac65.tar.bz2
ice-4bfa96c569e6ff0e57e3ead8b551246c5851ac65.tar.xz
ice-4bfa96c569e6ff0e57e3ead8b551246c5851ac65.zip
Added matching }, fixing typo.
Diffstat (limited to 'cpp/src/Ice/ThreadPool.cpp')
-rw-r--r--cpp/src/Ice/ThreadPool.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index 6486df6a162..78d8383ba54 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -616,7 +616,7 @@ IceInternal::ThreadPool::run()
if(epoll_ctl(_epollFd, EPOLL_CTL_DEL, change.first, &event) != 0)
{
Error out(_instance->initializationData().logger);
- out << "error while adding filedescriptor to epoll set:\n";
+ out << "error while adding filedescriptor from epoll set:\n";
out << errorToString(getSocketErrno());
continue;
}
@@ -627,7 +627,7 @@ IceInternal::ThreadPool::run()
if(kevent(_kqueueFd, &event, 1, 0, 0, 0) < 0)
{
Error out(_instance->initializationData().logger);
- out << "error while removing filedescriptor to kqueue:\n";
+ out << "error while removing filedescriptor from kqueue:\n";
out << errorToString(getSocketErrno());
continue;
}
@@ -697,7 +697,9 @@ IceInternal::ThreadPool::run()
smallestFd = min(smallestFd, fd);
}
-
+#ifdef never // To match __linux __APPLE
+ }}}
+#endif
if(largerFd <= _maxFd)
{
assert(largerFd >= _minFd);
@@ -725,7 +727,6 @@ IceInternal::ThreadPool::run()
//
// Now we are outside the thread synchronization.
//
-
if(shutdown)
{
//