From cfa71293ce31c8489341c892bf4612f57157db14 Mon Sep 17 00:00:00 2001 From: Yaxun Sam Liu Date: Wed, 19 Sep 2018 10:38:48 -0400 Subject: [PATCH] Silent warnings about duplicate static keyword static is already in __DEVICE__, so should be removed. --- hipamd/include/hip/hcc_detail/math_functions.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hipamd/include/hip/hcc_detail/math_functions.h b/hipamd/include/hip/hcc_detail/math_functions.h index 702c120b86..b618790133 100644 --- a/hipamd/include/hip/hcc_detail/math_functions.h +++ b/hipamd/include/hip/hcc_detail/math_functions.h @@ -1359,10 +1359,10 @@ __DEVICE__ inline static unsigned long long max(long long arg1, unsigned long lo return max((unsigned long long) arg1, arg2); }*/ #else -__DEVICE__ inline static int min(int arg1, int arg2) { +__DEVICE__ inline int min(int arg1, int arg2) { return (arg1 < arg2) ? arg1 : arg2; } -__DEVICE__ inline static int max(int arg1, int arg2) { +__DEVICE__ inline int max(int arg1, int arg2) { return (arg1 > arg2) ? arg1 : arg2; }