Merge pull request #4162 from Lompik/devel

Fix 2 compile errors in LockFreeHash.nim
This commit is contained in:
Andreas Rumpf
2016-05-15 10:57:10 +02:00

View File

@@ -52,7 +52,7 @@ when sizeof(int) == 4: # 32bit
{.deprecated: [TRaw: Raw].}
elif sizeof(int) == 8: # 64bit
type
Raw = range[0..4611686018427387903]
Raw = range[0'i64..4611686018427387903'i64]
## The range of uint values that can be stored directly in a value slot
## when on a 64 bit platform
{.deprecated: [TRaw: Raw].}
@@ -244,9 +244,9 @@ proc copySlot[K,V](idx: int, oldTbl: var PConcTable[K,V], newTbl: var PConcTable
echo("oldVal is Tomb!!!, should not happen")
if pop(oldVal) != 0:
result = setVal(newTbl, pop(oldKey), pop(oldVal), 0, true) == 0
if result:
#if result:
#echo("Copied a Slot! idx= " & $idx & " key= " & $oldKey & " val= " & $oldVal)
else:
#else:
#echo("copy slot failed")
# Our copy is done so we disable the old slot
while not ok: