diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-09-16 10:51:58 -0400 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-09-16 10:51:58 -0400 |
| commit | a2abdb185f9e47b663edce1bdfa3fa525502f321 (patch) | |
| tree | 9027e6f6886937afa463563dae176e5757cf006e /std/atomic | |
| parent | a6bf37f8ca5a2eabc7cacb22696d2a2c622a993d (diff) | |
| parent | 780e5674467ebac4534cd3d3f2199ccaf1d0922c (diff) | |
| download | zig-a2abdb185f9e47b663edce1bdfa3fa525502f321.tar.gz zig-a2abdb185f9e47b663edce1bdfa3fa525502f321.zip | |
Merge remote-tracking branch 'origin/master' into llvm7
Diffstat (limited to 'std/atomic')
| -rw-r--r-- | std/atomic/int.zig | 2 | ||||
| -rw-r--r-- | std/atomic/queue.zig | 4 | ||||
| -rw-r--r-- | std/atomic/stack.zig | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/std/atomic/int.zig b/std/atomic/int.zig index 4103d52719..6e07ef571a 100644 --- a/std/atomic/int.zig +++ b/std/atomic/int.zig @@ -6,7 +6,7 @@ pub fn Int(comptime T: type) type { return struct { unprotected_value: T, - pub const Self = this; + pub const Self = @This(); pub fn init(init_val: T) Self { return Self{ .unprotected_value = init_val }; diff --git a/std/atomic/queue.zig b/std/atomic/queue.zig index 6948af43ba..eea77d5534 100644 --- a/std/atomic/queue.zig +++ b/std/atomic/queue.zig @@ -12,7 +12,7 @@ pub fn Queue(comptime T: type) type { tail: ?*Node, mutex: std.Mutex, - pub const Self = this; + pub const Self = @This(); pub const Node = std.LinkedList(T).Node; pub fn init() Self { @@ -114,7 +114,7 @@ pub fn Queue(comptime T: type) type { fn dumpRecursive(optional_node: ?*Node, indent: usize) void { var stderr_file = std.io.getStdErr() catch return; - const stderr = &std.io.FileOutStream.init(&stderr_file).stream; + const stderr = &std.io.FileOutStream.init(stderr_file).stream; stderr.writeByteNTimes(' ', indent) catch return; if (optional_node) |node| { std.debug.warn("0x{x}={}\n", @ptrToInt(node), node.data); diff --git a/std/atomic/stack.zig b/std/atomic/stack.zig index 16d5c9503b..71896c66df 100644 --- a/std/atomic/stack.zig +++ b/std/atomic/stack.zig @@ -9,7 +9,7 @@ pub fn Stack(comptime T: type) type { root: ?*Node, lock: u8, - pub const Self = this; + pub const Self = @This(); pub const Node = struct { next: ?*Node, |