aboutsummaryrefslogtreecommitdiff
path: root/std
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2016-12-18 00:25:26 -0500
committerAndrew Kelley <superjoe30@gmail.com>2016-12-18 00:25:26 -0500
commit05b3b6a45e425e2cb6d46358ec28437c29969e83 (patch)
tree74f2d43bd2ce2bbd9efa7f81eece8635ff439566 /std
parent83a668b9caac7a9ae7ed2b2e9bf87f34ec2ab1eb (diff)
downloadzig-05b3b6a45e425e2cb6d46358ec28437c29969e83.tar.gz
zig-05b3b6a45e425e2cb6d46358ec28437c29969e83.zip
IR: update some std code to newest zig
Diffstat (limited to 'std')
-rw-r--r--std/io.zig4
-rw-r--r--std/math.zig2
2 files changed, 3 insertions, 3 deletions
diff --git a/std/io.zig b/std/io.zig
index 92de108661..c42cb294d9 100644
--- a/std/io.zig
+++ b/std/io.zig
@@ -1,6 +1,6 @@
const system = switch(@compileVar("os")) {
- linux => @import("linux.zig"),
- darwin => @import("darwin.zig"),
+ Os.linux => @import("linux.zig"),
+ Os.darwin => @import("darwin.zig"),
else => @compileError("Unsupported OS"),
};
diff --git a/std/math.zig b/std/math.zig
index b44a4d5def..acc9eaec73 100644
--- a/std/math.zig
+++ b/std/math.zig
@@ -12,7 +12,7 @@ pub fn max(x: var, y: var) -> @typeOf(x + y) {
if (x > y) x else y
}
-pub error Overflow;
+error Overflow;
pub fn mulOverflow(inline T: type, a: T, b: T) -> %T {
var answer: T = undefined;
if (@mulWithOverflow(T, a, b, &answer)) error.Overflow else answer