diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2017-11-02 18:24:33 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2017-11-02 18:24:33 +0100 |
| commit | 17ccb7f6b617dec5bca93ceb38fea2343f15b8d5 (patch) | |
| tree | d2e0fa9cec9c6a4ae262a0ae417f510ca33fb941 /lib | |
| parent | 30b098fcafbcf6d6f228a51decc533f38458d232 (diff) | |
| parent | 762ade11778e8e7152bdcd0866633d022d81250d (diff) | |
| download | Nim-17ccb7f6b617dec5bca93ceb38fea2343f15b8d5.tar.gz | |
Merge branch 'devel' into araq
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pure/times.nim | 4 | ||||
| -rw-r--r-- | lib/system/sysio.nim | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/pure/times.nim b/lib/pure/times.nim index 7dd428904..c1d6c3e53 100644 --- a/lib/pure/times.nim +++ b/lib/pure/times.nim @@ -224,7 +224,7 @@ proc `-`*(a, b: Time): int64 {. ## let a = fromSeconds(1_000_000_000) ## let b = fromSeconds(1_500_000_000) ## echo initInterval(seconds=int(b - a)) - ## # (milliseconds: 0, seconds: 20, minutes: 53, hours: 0, days: 5787, months: 0, years: 0) + ## # (milliseconds: 0, seconds: 20, minutes: 53, hours: 0, days: 5787, months: 0, years: 0) proc `<`*(a, b: Time): bool {. rtl, extern: "ntLtTime", tags: [], raises: [], noSideEffect.} = @@ -1225,7 +1225,7 @@ when not defined(JS): result.minute = t.minute result.hour = t.hour result.monthday = t.monthday - result.month = ord(t.month) + result.month = cint(t.month) result.year = cint(t.year - 1900) result.weekday = weekDays[t.weekday] result.yearday = t.yearday diff --git a/lib/system/sysio.nim b/lib/system/sysio.nim index a40fcc67d..4348ffbb5 100644 --- a/lib/system/sysio.nim +++ b/lib/system/sysio.nim @@ -192,7 +192,7 @@ proc write(f: File, r: float32) = proc write(f: File, r: BiggestFloat) = if c_fprintf(f, "%g", r) < 0: checkErr(f) -proc write(f: File, c: char) = discard c_putc(ord(c), f) +proc write(f: File, c: char) = discard c_putc(cint(c), f) proc write(f: File, a: varargs[string, `$`]) = for x in items(a): write(f, x) |