diff options
| author | Mark Spruiell <mes@zeroc.com> | 2014-03-19 12:45:55 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2014-03-19 12:45:55 -0700 |
| commit | cdcffbcc3c3c052afdeb772ff0167e7a90b525bb (patch) | |
| tree | 4f16ee41ef7d33394c44e9db81e4d6cd89908250 /cpp/src/Ice/ThreadPool.h | |
| parent | fixing testicedist.py for 5487 (diff) | |
| download | ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.tar.bz2 ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.tar.xz ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.zip | |
merging javascript branch
Diffstat (limited to 'cpp/src/Ice/ThreadPool.h')
| -rw-r--r-- | cpp/src/Ice/ThreadPool.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h index 43a8f2fb361..ab2189dbec3 100644 --- a/cpp/src/Ice/ThreadPool.h +++ b/cpp/src/Ice/ThreadPool.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -127,6 +127,7 @@ private: std::vector<std::pair<EventHandler*, SocketOperation> > _handlers; std::vector<std::pair<EventHandler*, SocketOperation> >::const_iterator _nextHandler; #endif + std::set<EventHandler*> _pendingHandlers; bool _promote; }; @@ -165,6 +166,9 @@ private: bool _ioCompleted; #if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT) bool _leader; +#else + DWORD _count; + int _error; #endif friend class ThreadPool; }; |