aboutsummaryrefslogtreecommitdiff
path: root/std/atomic/stack.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2019-06-23 01:29:48 -0400
committerAndrew Kelley <andrew@ziglang.org>2019-06-23 01:29:48 -0400
commit036cc48a829ff4625394995fbe22b7a884370103 (patch)
tree9776349a355575ffc75d7503ca7ebfe3469ba49c /std/atomic/stack.zig
parent5e58aa4884995476179f5e74014c16f771e61ba3 (diff)
parent9153b17c922e3166a824d300781ca4e6da015787 (diff)
downloadzig-036cc48a829ff4625394995fbe22b7a884370103.tar.gz
zig-036cc48a829ff4625394995fbe22b7a884370103.zip
Merge remote-tracking branch 'origin/master' into copy-elision-3
Diffstat (limited to 'std/atomic/stack.zig')
-rw-r--r--std/atomic/stack.zig7
1 files changed, 2 insertions, 5 deletions
diff --git a/std/atomic/stack.zig b/std/atomic/stack.zig
index e9d070ac7b..dd288adbf1 100644
--- a/std/atomic/stack.zig
+++ b/std/atomic/stack.zig
@@ -86,11 +86,8 @@ const puts_per_thread = 500;
const put_thread_count = 3;
test "std.atomic.stack" {
- var direct_allocator = std.heap.DirectAllocator.init();
- defer direct_allocator.deinit();
-
- var plenty_of_memory = try direct_allocator.allocator.alloc(u8, 300 * 1024);
- defer direct_allocator.allocator.free(plenty_of_memory);
+ var plenty_of_memory = try std.heap.direct_allocator.alloc(u8, 300 * 1024);
+ defer std.heap.direct_allocator.free(plenty_of_memory);
var fixed_buffer_allocator = std.heap.ThreadSafeFixedBufferAllocator.init(plenty_of_memory);
var a = &fixed_buffer_allocator.allocator;