diff options
| author | Dominik Picheta <dominikpicheta@gmail.com> | 2016-04-04 12:06:42 +0100 |
|---|---|---|
| committer | Dominik Picheta <dominikpicheta@gmail.com> | 2016-04-04 12:06:42 +0100 |
| commit | 436b0031736b7b569f18a90c67e62a483716037a (patch) | |
| tree | d938d5efd6ea4125c9f5d543ccca7489e637a4cb /lib/core | |
| parent | a70e6b3fde7c251aff68243de1c7adcebc3c67e3 (diff) | |
| parent | fbedb6c65514e394f163a68dd530d19d310afadf (diff) | |
| download | Nim-436b0031736b7b569f18a90c67e62a483716037a.tar.gz | |
Merge branch 'devel' of github.com:nim-lang/Nim into devel
Diffstat (limited to 'lib/core')
| -rw-r--r-- | lib/core/locks.nim | 3 | ||||
| -rw-r--r-- | lib/core/rlocks.nim | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/core/locks.nim b/lib/core/locks.nim index 66e0ab520..fbe9c8acf 100644 --- a/lib/core/locks.nim +++ b/lib/core/locks.nim @@ -9,6 +9,7 @@ ## This module contains Nim's support for locks and condition vars. +const insideRLocksModule = false include "system/syslocks" type @@ -63,4 +64,4 @@ template withLock*(a: Lock, body: untyped) = try: body finally: - a.release() \ No newline at end of file + a.release() diff --git a/lib/core/rlocks.nim b/lib/core/rlocks.nim index 14f04592b..4710d6cf1 100644 --- a/lib/core/rlocks.nim +++ b/lib/core/rlocks.nim @@ -9,6 +9,7 @@ ## This module contains Nim's support for reentrant locks. +const insideRLocksModule = true include "system/syslocks" type |