diff options
| -rw-r--r-- | lib/pure/ioselects/ioselectors_epoll.nim | 4 | ||||
| -rw-r--r-- | lib/pure/ioselects/ioselectors_select.nim | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/pure/ioselects/ioselectors_epoll.nim b/lib/pure/ioselects/ioselectors_epoll.nim index da7ef8a9a..bf13cc83e 100644 --- a/lib/pure/ioselects/ioselectors_epoll.nim +++ b/lib/pure/ioselects/ioselectors_epoll.nim @@ -197,7 +197,7 @@ proc unregister*[T](s: Selector[T], fd: int|SocketHandle) = "Descriptor $# is not registered in the selector!" % $fdi) if pkey.events != {}: when not defined(android): - if pkey.events * {Event.Read, Event.Write, Event.User} != {}: + if Event.Read in pkey.events or Event.Write in pkey.events or Event.User in pkey.events: var epv = EpollEvent() # TODO: Refactor all these EPOLL_CTL_DEL + dec(s.count) into a proc. if epoll_ctl(s.epollFD, EPOLL_CTL_DEL, fdi.cint, addr epv) != 0: @@ -237,7 +237,7 @@ proc unregister*[T](s: Selector[T], fd: int|SocketHandle) = if posix.close(cint(fdi)) != 0: raiseIOSelectorsError(osLastError()) else: - if pkey.events * {Event.Read, Event.Write} != {}: + if Event.Read in pkey.events or Event.Write in pkey.events or Event.User in pkey.events: var epv = EpollEvent() if epoll_ctl(s.epollFD, EPOLL_CTL_DEL, fdi.cint, addr epv) != 0: raiseIOSelectorsError(osLastError()) diff --git a/lib/pure/ioselects/ioselectors_select.nim b/lib/pure/ioselects/ioselectors_select.nim index 2d53da26b..b90a01c06 100644 --- a/lib/pure/ioselects/ioselectors_select.nim +++ b/lib/pure/ioselects/ioselectors_select.nim @@ -286,7 +286,7 @@ proc unregister*[T](s: Selector[T], fd: SocketHandle|int) = s.withSelectLock(): let fd = fd.SocketHandle var pkey = s.getKey(fd) - if pkey.events * {Event.Read, Event.User} != {}: + if Event.Read in pkey.events or Event.User in pkey.events: IOFD_CLR(fd, addr s.rSet) dec(s.count) if Event.Write in pkey.events: @@ -462,4 +462,4 @@ template withData*[T](s: Selector[T], fd: SocketHandle|int, value, proc getFd*[T](s: Selector[T]): int = - return -1 \ No newline at end of file + return -1 |