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

C++: make async tests green on Windows

Browse source
This commit is contained in:
Araq 2018-12-21 17:16:14 +01:00
commit 4a6d699bc5
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/sigmatch.nim
View file

@ -2233,9 +2233,9 @@ proc matchesAux(c: PContext, n, nOrig: PNode,
return return
if formal.typ.kind == tyVar: if formal.typ.kind == tyVar:
let arg_converter = if arg.kind == nkHiddenDeref: arg[0] else: arg let argConverter = if arg.kind == nkHiddenDeref: arg[0] else: arg
if arg_converter.kind == nkHiddenCallConv: if argConverter.kind == nkHiddenCallConv:
if arg_converter.typ.kind != tyVar: if argConverter.typ.kind != tyVar:
m.state = csNoMatch m.state = csNoMatch
m.mutabilityProblem = uint8(f-1) m.mutabilityProblem = uint8(f-1)
return return

2
lib/windows/winlean.nim
View file

@ -516,7 +516,7 @@ type
fd_count*: cint # unsigned fd_count*: cint # unsigned
fd_array*: array[0..FD_SETSIZE-1, SocketHandle] fd_array*: array[0..FD_SETSIZE-1, SocketHandle]
Timeval* = object Timeval* {.importc: "timeval", header: "<time.h>".} = object
tv_sec*, tv_usec*: int32 tv_sec*, tv_usec*: int32
AddrInfo* = object AddrInfo* = object

1
tests/async/tasynctry.nim
View file

@ -6,6 +6,7 @@ Multiple idents in except
Multiple except branches Multiple except branches
Multiple except branches 2 Multiple except branches 2
''' '''
targets: "c"
""" """
import asyncdispatch, strutils import asyncdispatch, strutils