diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2019-08-13 06:37:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-13 06:37:37 +0200 |
| commit | 433613e2675064583ee5055d47aa89a43184e7f2 (patch) | |
| tree | 5bf9c7abfc77ab2661a5fec98201dce06da9ea12 | |
| parent | 322ce1872fd13e7b3029db800727ecdc886ad8a3 (diff) | |
| download | Nim-433613e2675064583ee5055d47aa89a43184e7f2.tar.gz | |
fixes #11844 (#11935)
| -rw-r--r-- | lib/core/allocators.nim | 8 | ||||
| -rw-r--r-- | tests/destructor/tnewruntime_misc.nim | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/core/allocators.nim b/lib/core/allocators.nim index 962a99fd6..259319ca2 100644 --- a/lib/core/allocators.nim +++ b/lib/core/allocators.nim @@ -13,10 +13,10 @@ type ZerosMem ## the allocator always zeros the memory on an allocation Allocator* = ptr AllocatorObj AllocatorObj* {.inheritable, compilerproc.} = object - alloc*: proc (a: Allocator; size: int; alignment: int = 8): pointer {.nimcall, raises: [], tags: [].} - dealloc*: proc (a: Allocator; p: pointer; size: int) {.nimcall, raises: [], tags: [].} - realloc*: proc (a: Allocator; p: pointer; oldSize, newSize: int): pointer {.nimcall, raises: [], tags: [].} - deallocAll*: proc (a: Allocator) {.nimcall, raises: [], tags: [].} + alloc*: proc (a: Allocator; size: int; alignment: int = 8): pointer {.nimcall, raises: [], tags: [], gcsafe.} + dealloc*: proc (a: Allocator; p: pointer; size: int) {.nimcall, raises: [], tags: [], gcsafe.} + realloc*: proc (a: Allocator; p: pointer; oldSize, newSize: int): pointer {.nimcall, raises: [], tags: [], gcsafe.} + deallocAll*: proc (a: Allocator) {.nimcall, raises: [], tags: [], gcsafe.} flags*: set[AllocatorFlag] name*: cstring allocCount: int diff --git a/tests/destructor/tnewruntime_misc.nim b/tests/destructor/tnewruntime_misc.nim index 0e9541e2e..c5f978a98 100644 --- a/tests/destructor/tnewruntime_misc.nim +++ b/tests/destructor/tnewruntime_misc.nim @@ -1,5 +1,5 @@ discard """ - cmd: '''nim cpp --newruntime $file''' + cmd: '''nim cpp --newruntime --threads:on $file''' output: '''(field: "value") Indeed axc |