diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-08-21 15:55:01 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-08-21 15:55:01 +0200 |
| commit | b9f2fa14fb3f222a6ec5e0a93bf25fe5ad12b56a (patch) | |
| tree | 183215e2dbeadfbc871b800ce09726e58af38b91 /cpp/src/Ice/EventHandler.cpp | |
| parent | adding compression cookbook demo (diff) | |
| download | ice-b9f2fa14fb3f222a6ec5e0a93bf25fe5ad12b56a.tar.bz2 ice-b9f2fa14fb3f222a6ec5e0a93bf25fe5ad12b56a.tar.xz ice-b9f2fa14fb3f222a6ec5e0a93bf25fe5ad12b56a.zip | |
IOCP changes, bug 3501, 4200, 4156, 3101
Diffstat (limited to 'cpp/src/Ice/EventHandler.cpp')
| -rw-r--r-- | cpp/src/Ice/EventHandler.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp index dd9412a9b7d..33cb73632e8 100644 --- a/cpp/src/Ice/EventHandler.cpp +++ b/cpp/src/Ice/EventHandler.cpp @@ -15,20 +15,17 @@ using namespace Ice; using namespace IceInternal; IceUtil::Shared* IceInternal::upCast(EventHandler* p) { return p; } -ICE_DECLSPEC_EXPORT IceUtil::Shared* IceInternal::upCast(ThreadPoolWorkItem* p) { return p; } -InstancePtr -IceInternal::EventHandler::instance() const -{ - return _instance; -} - -IceInternal::EventHandler::EventHandler(const InstancePtr& instance, SOCKET fd) : - _instance(instance), - _stream(_instance.get()), - _fd(fd), - _serializing(false), - _registered(false) +IceInternal::EventHandler::EventHandler() : +#ifdef ICE_USE_IOCP + _pending(SocketOperationNone), + _ready(SocketOperationNone), + _started(SocketOperationNone), + _finish(false), +#else + _disabled(SocketOperationNone), +#endif + _registered(SocketOperationNone) { } |