jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert stdlib changes which are not required anymore

Browse source
This commit is contained in:
Andreas Rumpf 2020-04-01 14:34:24 +02:00
commit 484548c784
6 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/pure/ioselects/ioselectors_epoll.nim
View file

@ -502,7 +502,8 @@ proc contains*[T](s: Selector[T], fd: SocketHandle|int): bool {.inline.} =
proc getData*[T](s: Selector[T], fd: SocketHandle|int): var T =
let fdi = int(fd)
s.checkFd(fdi)
result = s.fds[fdi].data
if fdi in s:
result = s.fds[fdi].data
proc setData*[T](s: Selector[T], fd: SocketHandle|int, data: T): bool =
let fdi = int(fd)

3
lib/pure/ioselects/ioselectors_kqueue.nim
View file

@ -600,7 +600,8 @@ proc contains*[T](s: Selector[T], fd: SocketHandle|int): bool {.inline.} =
proc getData*[T](s: Selector[T], fd: SocketHandle|int): var T =
let fdi = int(fd)
s.checkFd(fdi)
result = s.fds[fdi].data
if fdi in s:
result = s.fds[fdi].data
proc setData*[T](s: Selector[T], fd: SocketHandle|int, data: T): bool =
let fdi = int(fd)

8
lib/pure/ioselects/ioselectors_select.nim
View file

@ -410,17 +410,11 @@ else:
body
proc getData*[T](s: Selector[T], fd: SocketHandle|int): var T =
# The compiler needs this to prove that all code paths return a value
result = (cast[ptr T](0'u))[]
s.withSelectLock():
let fdi = int(fd)
for i in 0..<FD_SETSIZE:
if s.fds[i].ident == fdi:
result = s.fds[i].data
break
assert cast[uint](addr(result)) != 0
return s.fds[i].data
proc setData*[T](s: Selector[T], fd: SocketHandle|int, data: T): bool =
s.withSelectLock():