diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-01-23 11:31:53 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-01-23 11:31:53 +0100 |
| commit | c7fb26230801e62f3e690a8948d37c33517c4c13 (patch) | |
| tree | f17689f60e13fbbd20d12473272a6f0652f39a78 /cpp/src/Ice/Selector.cpp | |
| parent | removing EventHandler in C# (diff) | |
| download | ice-c7fb26230801e62f3e690a8948d37c33517c4c13.tar.bz2 ice-c7fb26230801e62f3e690a8948d37c33517c4c13.tar.xz ice-c7fb26230801e62f3e690a8948d37c33517c4c13.zip | |
- Added IceUtil::SyscallException and cleaned up few IceUtil exceptions
- Added errorToString() and lastErrorToString() functions to IceUtil/StringUtil.h
- Replaced multiple implementations of errorToString methods with the IceUtil one.
- Fixed bug 2641.
Diffstat (limited to 'cpp/src/Ice/Selector.cpp')
| -rw-r--r-- | cpp/src/Ice/Selector.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/Ice/Selector.cpp b/cpp/src/Ice/Selector.cpp index 5e82c2f7ee3..822a5bedd48 100644 --- a/cpp/src/Ice/Selector.cpp +++ b/cpp/src/Ice/Selector.cpp @@ -8,6 +8,7 @@ // ********************************************************************** #include <IceUtil/DisableWarnings.h> +#include <IceUtil/StringUtil.h> #include <Ice/Selector.h> #include <Ice/Network.h> #include <Ice/Instance.h> @@ -146,7 +147,7 @@ IceInternal::Selector::add(SOCKET fd, SocketStatus status) { Error out(_instance->initializationData().logger); out << "error while adding filedescriptor to epoll set:\n"; - out << errorToString(getSocketErrno()); + out << IceInternalUtil::errorToString(getSocketErrno()); } _events.resize(_events.size() + 1); #elif defined(__APPLE__) @@ -167,7 +168,7 @@ IceInternal::Selector::add(SOCKET fd, SocketStatus status) { Error out(_instance->initializationData().logger); out << "error while adding filedescriptor to kqueue:\n"; - out << errorToString(getSocketErrno()); + out << IceUtilInternal::errorToString(getSocketErrno()); } _events.resize(_events.size() + 1); #else @@ -219,7 +220,7 @@ Selector::remove(SOCKET fd, SocketStatus status) // // Error out(_instance->initializationData().logger); // out << "error while removing filedescriptor from epoll set:\n"; -// out << errorToString(getSocketErrno()); +// out << IceUtilInternal::errorToString(getSocketErrno()); } _events.resize(_events.size() - 1); #elif defined(__APPLE__) @@ -244,7 +245,7 @@ Selector::remove(SOCKET fd, SocketStatus status) // // Error out(_instance->initializationData().logger); // out << "error while removing filedescriptor from kqueue:\n"; -// out << errorToString(getSocketErrno()); +// out << IceUtilInternal::errorToString(getSocketErrno()); } _events.resize(_events.size() - 1); #else |