diff options
| author | Zahary Karadjov <zahary@gmail.com> | 2013-12-09 00:26:04 +0200 |
|---|---|---|
| committer | Zahary Karadjov <zahary@gmail.com> | 2013-12-09 00:26:04 +0200 |
| commit | 95a6e01ea8f7409e205455c42a3db9b399b3e353 (patch) | |
| tree | f7e3270dd7e631365f1b4ab777464320f6a6352b /lib/system | |
| parent | de3b7cd413e02498c0ee5554f55f9c92d2baa9ab (diff) | |
| parent | 7e9f158494315abff712110a23f1d5ceb3df4206 (diff) | |
| download | Nim-95a6e01ea8f7409e205455c42a3db9b399b3e353.tar.gz | |
Merge branch 'master' of github.com:Araq/Nimrod into upstream
Diffstat (limited to 'lib/system')
| -rw-r--r-- | lib/system/channels.nim | 3 | ||||
| -rw-r--r-- | lib/system/gc.nim | 3 | ||||
| -rw-r--r-- | lib/system/threads.nim | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/lib/system/channels.nim b/lib/system/channels.nim index d0294322a..9c3cc93e0 100644 --- a/lib/system/channels.nim +++ b/lib/system/channels.nim @@ -13,6 +13,9 @@ ## ## **Note:** The current implementation of message passing is slow and does ## not work with cyclic data structures. + +when not defined(NimString): + {.error: "You must not import this module explicitly".} type pbytes = ptr array[0.. 0xffff, byte] diff --git a/lib/system/gc.nim b/lib/system/gc.nim index 48705db96..d2b065d6b 100644 --- a/lib/system/gc.nim +++ b/lib/system/gc.nim @@ -629,8 +629,7 @@ proc doOperation(p: pointer, op: TWalkOp) = case op of waZctDecRef: #if not isAllocatedPtr(gch.region, c): - # return - # c_fprintf(c_stdout, "[GC] decref bug: %p", c) + # c_fprintf(c_stdout, "[GC] decref bug: %p", c) gcAssert(isAllocatedPtr(gch.region, c), "decRef: waZctDecRef") gcAssert(c.refcount >=% rcIncrement, "doOperation 2") #c.refcount = c.refcount -% rcIncrement diff --git a/lib/system/threads.nim b/lib/system/threads.nim index 7d74de92d..104ca63c1 100644 --- a/lib/system/threads.nim +++ b/lib/system/threads.nim @@ -39,6 +39,9 @@ ## createThread(thr[i], threadFunc, (i*10, i*10+5)) ## joinThreads(thr) +when not defined(NimString): + {.error: "You must not import this module explicitly".} + const maxRegisters = 256 # don't think there is an arch with more registers useStackMaskHack = false ## use the stack mask hack for better performance |