diff options
| author |  Attila Molnar | 2016-08-19 18:01:43 +0200 |
|---|---|---|
| committer |  GitHub | 2016-08-19 18:01:43 +0200 |
| commit | 2df0de3c9212f7ea74fcb9a0ccf20990e47e9f2e (patch) | |
| tree | 090b5c158e8d1669ed4d81bce6d3834ae9cf8bae /src/socketengines/socketengine_poll.cpp | |
| parent | m_spanningtree Put command handlers with class names that collide with core c... (diff) | |
| parent | Fix m_mysql warning about use of C++11 features on C++03. (diff) | |
Merge pull request #1200 from SaberUK/master+travis
Fix Travis builds on master.
Diffstat (limited to 'src/socketengines/socketengine_poll.cpp')
| -rw-r--r-- | src/socketengines/socketengine_poll.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp index 5fd7e6235..59991d80d 100644 --- a/src/socketengines/socketengine_poll.cpp +++ b/src/socketengines/socketengine_poll.cpp @@ -168,7 +168,7 @@ int SocketEngine::DispatchEvents() int processed = 0; ServerInstance->UpdateTime(); - for (int index = 0; index < CurrentSetSize && processed < i; index++) + for (size_t index = 0; index < CurrentSetSize && processed < i; index++) { struct pollfd& pfd = events[index]; @@ -217,7 +217,7 @@ int SocketEngine::DispatchEvents() // The vector could've been resized, reference can be invalid by now; don't use it events[index].events = mask_to_poll(mask); - eh->eh->OnEventHandlerWrite(); + eh->OnEventHandlerWrite(); } } |