diff options
author | Milos Negovanovic <milos.negovanovic@gmail.com> | 2014-09-19 13:03:07 +0100 |
---|---|---|
committer | Milos Negovanovic <milos.negovanovic@gmail.com> | 2014-09-19 13:03:07 +0100 |
commit | 8b4d4be9ab58748d3312a59becd6ebef7506d6fd (patch) | |
tree | 185669f141f3428cb17a280a309b21212e84e49c /lib/system/jssys.nim | |
parent | 434dcd7166361fddd84953d8cdd0de68564096ba (diff) | |
parent | d2b7aed229b3a347b614c7ea0f3c1f29513e1c08 (diff) | |
download | Nim-8b4d4be9ab58748d3312a59becd6ebef7506d6fd.tar.gz |
Merge branch 'devel' of github.com:Araq/Nimrod into devel
Merging mainline devel.
Diffstat (limited to 'lib/system/jssys.nim')
-rw-r--r-- | lib/system/jssys.nim | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/system/jssys.nim b/lib/system/jssys.nim index 8766906e3..423f63e2a 100644 --- a/lib/system/jssys.nim +++ b/lib/system/jssys.nim @@ -515,7 +515,7 @@ proc isFatPointer(ti: PNimType): bool = proc nimCopy(x: pointer, ti: PNimType): pointer {.compilerproc.} -proc nimCopyAux(dest, src: Pointer, n: ptr TNimNode) {.compilerproc.} = +proc nimCopyAux(dest, src: pointer, n: ptr TNimNode) {.compilerproc.} = case n.kind of nkNone: sysAssert(false, "nimCopyAux") of nkSlot: @@ -566,7 +566,7 @@ proc nimCopy(x: pointer, ti: PNimType): pointer = else: result = x -proc genericReset(x: Pointer, ti: PNimType): pointer {.compilerproc.} = +proc genericReset(x: pointer, ti: PNimType): pointer {.compilerproc.} = case ti.kind of tyPtr, tyRef, tyVar, tyNil: if not isFatPointer(ti): |