Commit 180fe8d506

Josh Wolfe <thejoshwolfe@gmail.com>
2017-09-01 02:45:06
fix return types of min amd max
master
1 parent 06b64d8
Changed files (1)
std
math
index.zig
std/math/index.zig
@@ -180,7 +180,7 @@ pub const Cmp = enum {
     Greater,
 };
 
-pub fn min(x: var, y: var) -> @typeOf(x + y) {
+pub fn min(x: var, y: var) -> @typeOf(if (x < y) x else y) {
     if (x < y) x else y
 }
 
@@ -188,7 +188,7 @@ test "math.min" {
     assert(min(i32(-1), i32(2)) == -1);
 }
 
-pub fn max(x: var, y: var) -> @typeOf(x + y) {
+pub fn max(x: var, y: var) -> @typeOf(if (x > y) x else y) {
     if (x > y) x else y
 }