diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2021-02-17 00:07:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-17 00:07:37 +0100 |
| commit | e463a67c74801da832e8659065c162b37f549d64 (patch) | |
| tree | bfcbf3939666e601578604e06304bac754216cc5 | |
| parent | 81703d4ad4c7dd5746f67947371bdef5a38b2ad7 (diff) | |
| download | Nim-e463a67c74801da832e8659065c162b37f549d64.tar.gz | |
don't introduce 'dispose', use '=dispose', fixes #17003 [backport:1.4] (#17062)
| -rw-r--r-- | lib/system/arc.nim | 2 | ||||
| -rw-r--r-- | tests/destructor/tbintree2.nim | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/system/arc.nim b/lib/system/arc.nim index 9ee367543..7f533089c 100644 --- a/lib/system/arc.nim +++ b/lib/system/arc.nim @@ -163,7 +163,7 @@ proc nimRawDispose(p: pointer, alignment: int) {.compilerRtl.} = let hdrSize = align(sizeof(RefHeader), alignment) alignedDealloc(p -! hdrSize, alignment) -template dispose*[T](x: owned(ref T)) = nimRawDispose(cast[pointer](x), T.alignOf) +template `=dispose`*[T](x: owned(ref T)) = nimRawDispose(cast[pointer](x), T.alignOf) #proc dispose*(x: pointer) = nimRawDispose(x) proc nimDestroyAndDispose(p: pointer) {.compilerRtl, raises: [].} = diff --git a/tests/destructor/tbintree2.nim b/tests/destructor/tbintree2.nim index 6fdda6e54..0bc52457c 100644 --- a/tests/destructor/tbintree2.nim +++ b/tests/destructor/tbintree2.nim @@ -57,7 +57,7 @@ proc `=destroy`(t: var Tree) {.nodestroy.} = let x = s.pop if x.left != nil: s.add(x.left) if x.right != nil: s.add(x.right) - dispose(x) + `=dispose`(x) `=destroy`(s) proc hasValue(self: var Tree, x: int32): bool = |