diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2019-10-18 15:59:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-18 15:59:22 +0200 |
| commit | 889b745b2b57927e2953d6e8bacaa68fde13513e (patch) | |
| tree | 79cf9bb0ff2f7a53372750f8602a1dbfb303fdb3 /lib/pure | |
| parent | f5b4d9a2e52285f48eb75100495f150d347cb161 (diff) | |
| download | Nim-889b745b2b57927e2953d6e8bacaa68fde13513e.tar.gz | |
Revert "Fixes #12187 (#12321)" (#12447)
This reverts commit 00c31e87660d9db813871f5aa23661bf6b9bbdcb.
Diffstat (limited to 'lib/pure')
| -rw-r--r-- | lib/pure/concurrency/cpuinfo.nim | 2 | ||||
| -rw-r--r-- | lib/pure/memfiles.nim | 2 | ||||
| -rw-r--r-- | lib/pure/strutils.nim | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/pure/concurrency/cpuinfo.nim b/lib/pure/concurrency/cpuinfo.nim index 5a72459a3..415b9a787 100644 --- a/lib/pure/concurrency/cpuinfo.nim +++ b/lib/pure/concurrency/cpuinfo.nim @@ -79,7 +79,7 @@ proc countProcessors*(): int {.rtl, extern: "ncpi$1".} = len: csize mib[0] = CTL_HW mib[1] = HW_AVAILCPU - len = csize sizeof(numCPU) + len = sizeof(numCPU) discard sysctl(addr(mib), 2, addr(numCPU), len, nil, 0) if numCPU < 1: mib[1] = HW_NCPU diff --git a/lib/pure/memfiles.nim b/lib/pure/memfiles.nim index 7e0478877..411df1456 100644 --- a/lib/pure/memfiles.nim +++ b/lib/pure/memfiles.nim @@ -416,7 +416,7 @@ iterator memSlices*(mfile: MemFile, delim = '\l', eat = '\r'): MemSlice {.inline ms.data = mfile.mem var remaining = mfile.size while remaining > 0: - ending = c_memchr(ms.data, delim, csize remaining) + ending = c_memchr(ms.data, delim, remaining) if ending == nil: # unterminated final slice ms.size = remaining # Weird case..check eat? yield ms diff --git a/lib/pure/strutils.nim b/lib/pure/strutils.nim index fd5dcf14c..69cb1efd5 100644 --- a/lib/pure/strutils.nim +++ b/lib/pure/strutils.nim @@ -1872,7 +1872,7 @@ proc find*(s: string, sub: char, start: Natural = 0, last = 0): int {.noSideEffe when hasCStringBuiltin: let L = last-start+1 if L > 0: - let found = c_memchr(s[start].unsafeAddr, sub, csize L) + let found = c_memchr(s[start].unsafeAddr, sub, L) if not found.isNil: return cast[ByteAddress](found) -% cast[ByteAddress](s.cstring) else: |