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

fix #11854 (#11857)

Browse source
This commit is contained in:
Arne Döring 2019-07-30 17:24:42 +02:00 • committed by GitHub
commit 803406d07c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/system/threadlocalstorage.nim
View file

@ -144,12 +144,12 @@ else:
tv_sec: Time tv_sec: Time
tv_nsec: clong tv_nsec: clong
proc pthread_attr_init(a1: var PthreadAttr) {. proc pthread_attr_init(a1: var Pthread_attr) {.
importc, header: pthreadh.} importc, header: pthreadh.}
proc pthread_attr_setstacksize(a1: var PthreadAttr, a2: int) {. proc pthread_attr_setstacksize(a1: var Pthread_attr, a2: int) {.
importc, header: pthreadh.} importc, header: pthreadh.}
proc pthread_create(a1: var SysThread, a2: var PthreadAttr, proc pthread_create(a1: var SysThread, a2: var Pthread_attr,
a3: proc (x: pointer): pointer {.noconv.}, a3: proc (x: pointer): pointer {.noconv.},
a4: pointer): cint {.importc: "pthread_create", a4: pointer): cint {.importc: "pthread_create",
header: pthreadh.} header: pthreadh.}

2
lib/system/threads.nim
View file

@ -309,7 +309,7 @@ else:
when TArg isnot void: t.data = param when TArg isnot void: t.data = param
t.dataFn = tp t.dataFn = tp
when hasSharedHeap: t.core.stackSize = ThreadStackSize when hasSharedHeap: t.core.stackSize = ThreadStackSize
var a {.noinit.}: PthreadAttr var a {.noinit.}: Pthread_attr
pthread_attr_init(a) pthread_attr_init(a)
pthread_attr_setstacksize(a, ThreadStackSize) pthread_attr_setstacksize(a, ThreadStackSize)
if pthread_create(t.sys, a, threadProcWrapper[TArg], addr(t)) != 0: if pthread_create(t.sys, a, threadProcWrapper[TArg], addr(t)) != 0:

2
tests/concepts/texplain.nim
View file

@ -1,7 +1,6 @@
discard """ discard """
cmd: "nim c --verbosity:0 --colors:off $file" cmd: "nim c --verbosity:0 --colors:off $file"
nimout: ''' nimout: '''
Hint: texplain [Processing]
texplain.nim(158, 10) Hint: Non-matching candidates for e(y) texplain.nim(158, 10) Hint: Non-matching candidates for e(y)
proc e(i: int): int proc e(i: int): int
first type mismatch at position: 1 first type mismatch at position: 1
@ -117,6 +116,7 @@ expression: f(y)'''
# line 120 HERE # line 120 HERE
type type