diff options
Diffstat (limited to 'intern/cycles/util/math.h')
-rw-r--r-- | intern/cycles/util/math.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/intern/cycles/util/math.h b/intern/cycles/util/math.h index a580a21c28b..605a19aaef0 100644 --- a/intern/cycles/util/math.h +++ b/intern/cycles/util/math.h @@ -124,12 +124,7 @@ ccl_device_inline int min(int a, int b) return (a < b) ? a : b; } -ccl_device_inline uint32_t min(uint32_t a, uint32_t b) -{ - return (a < b) ? a : b; -} - -ccl_device_inline uint64_t min(uint64_t a, uint64_t b) +ccl_device_inline uint min(uint a, uint b) { return (a < b) ? a : b; } |