| author |  Josh Wolfe <thejoshwolfe@gmail.com> 2017-08-31 17:56:06-07:00 |
| committer | Josh Wolfe <thejoshwolfe@gmail.com> 2017-08-31 17:56:06-07:00 |
| log | 848504117f17a5fa8ead8c168e0e430e22be6e43 |
| tree | a6154a7bbc5cbf6eb8945dc84ebfe689c7a4f41a |
| parent | 180fe8d506d9253532f593bab4605f752eff0ffc |
Revert "fix return types of min amd max"
This reverts commit 180fe8d506d9253532f593bab4605f752eff0ffc.1 files changed, 2 insertions(+), 2 deletions(-)
std- math
std/math/index.zig+2-2
| ... | ... | @@ -180,7 +180,7 @@ pub const Cmp = enum { |
| 180 | 180 | Greater, |
| 181 | 181 | }; |
| 182 | 182 | |
| 183 | pub fn min(x: var, y: var) -> @typeOf(if (x < y) x else y) { | |
| 183 | pub fn min(x: var, y: var) -> @typeOf(x + y) { | |
| 184 | 184 | if (x < y) x else y |
| 185 | 185 | } |
| 186 | 186 | |
| ... | ... | @@ -188,7 +188,7 @@ test "math.min" { |
| 188 | 188 | assert(min(i32(-1), i32(2)) == -1); |
| 189 | 189 | } |
| 190 | 190 | |
| 191 | pub fn max(x: var, y: var) -> @typeOf(if (x > y) x else y) { | |
| 191 | pub fn max(x: var, y: var) -> @typeOf(x + y) { | |
| 192 | 192 | if (x > y) x else y |
| 193 | 193 | } |
| 194 | 194 |