authorgravatar for thejoshwolfe@gmail.comJosh Wolfe <thejoshwolfe@gmail.com> 2017-08-31 17:45:06-07:00
committergravatar for thejoshwolfe@gmail.comJosh Wolfe <thejoshwolfe@gmail.com> 2017-08-31 17:45:34-07:00
log180fe8d506d9253532f593bab4605f752eff0ffc
tree5f108549e2aa72cbffba1825a1d245462b3d0476
parent06b64d82bf4baad296ff7c37d7c8ff08ce2bdc69

fix return types of min amd max

1 files changed, 2 insertions(+), 2 deletions(-)

std/math/index.zig+2-2
...@@ -180,7 +180,7 @@ pub const Cmp = enum {...@@ -180,7 +180,7 @@ pub const Cmp = enum {
180 Greater,180 Greater,
181};181};
182182
183pub fn min(x: var, y: var) -> @typeOf(x + y) {183pub fn min(x: var, y: var) -> @typeOf(if (x < y) x else y) {
184 if (x < y) x else y184 if (x < y) x else y
185}185}
186186
...@@ -188,7 +188,7 @@ test "math.min" {...@@ -188,7 +188,7 @@ test "math.min" {
188 assert(min(i32(-1), i32(2)) == -1);188 assert(min(i32(-1), i32(2)) == -1);
189}189}
190190
191pub fn max(x: var, y: var) -> @typeOf(x + y) {191pub fn max(x: var, y: var) -> @typeOf(if (x > y) x else y) {
192 if (x > y) x else y192 if (x > y) x else y
193}193}
194194