diff options
| author | Araq <rumpf_a@web.de> | 2016-03-29 15:30:44 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2016-03-29 15:31:10 +0200 |
| commit | db2b2156581ffaaa63e7ff9c0a07ced540006956 (patch) | |
| tree | 341535aa355ef422ee886f7b14fda6fbfeae0523 /lib/pure/collections/tableimpl.nim | |
| parent | 8bf14b12a963980e71ad46e16a8a2e35c9465b8c (diff) | |
| parent | b4f1eef3a3b0ff56d0a68c15c43ffecb7778e939 (diff) | |
| download | Nim-db2b2156581ffaaa63e7ff9c0a07ced540006956.tar.gz | |
resolved merge conflicts
Diffstat (limited to 'lib/pure/collections/tableimpl.nim')
| -rw-r--r-- | lib/pure/collections/tableimpl.nim | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pure/collections/tableimpl.nim b/lib/pure/collections/tableimpl.nim index beafe1109..e4ec05b1c 100644 --- a/lib/pure/collections/tableimpl.nim +++ b/lib/pure/collections/tableimpl.nim @@ -129,4 +129,7 @@ template delImpl() {.dirty, immediate.} = r = t.data[i].hcode and msk # "home" location of key@i if not ((i >= r and r > j) or (r > j and j > i) or (j > i and i >= r)): break - shallowCopy(t.data[j], t.data[i]) # data[j] will be marked EMPTY next loop + when defined(js): + t.data[j] = t.data[i] + else: + shallowCopy(t.data[j], t.data[i]) # data[j] will be marked EMPTY next loop |