diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2016-02-29 12:20:04 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2016-02-29 12:20:04 +0100 |
| commit | bd95bf58bfab31034db346d946e8e3b6bb5d19cc (patch) | |
| tree | 661d52fff70a0933ed73a4c73c1c0e7ca728a899 | |
| parent | c9966a3e178bc5bc21684d3f4f65c8580227d2f4 (diff) | |
| parent | ef1d771cf2bb5f9db81ef771243d8ab5b12a6b78 (diff) | |
| download | Nim-bd95bf58bfab31034db346d946e8e3b6bb5d19cc.tar.gz | |
Merge branch 'devel' of github.com:nim-lang/Nim into devel
| -rw-r--r-- | lib/pure/json.nim | 3 | ||||
| -rw-r--r-- | lib/pure/times.nim | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/pure/json.nim b/lib/pure/json.nim index 3565e2feb..2da14c363 100644 --- a/lib/pure/json.nim +++ b/lib/pure/json.nim @@ -53,6 +53,9 @@ import hashes, tables, strutils, lexbase, streams, unicode, macros +export + tables.`$` + type JsonEventKind* = enum ## enumeration of all events that may occur when parsing jsonError, ## an error occurred during parsing diff --git a/lib/pure/times.nim b/lib/pure/times.nim index 03745d54e..e39756696 100644 --- a/lib/pure/times.nim +++ b/lib/pure/times.nim @@ -635,7 +635,7 @@ elif defined(JS): proc toSeconds(time: Time): float = result = time.getTime() / 1000 - proc getTimezone(): int = result = newDate().getTimezoneOffset() + proc getTimezone(): int = result = newDate().getTimezoneOffset() * 60 proc epochTime*(): float {.tags: [TimeEffect].} = newDate().toSeconds() |