From 7c707dd41c85cbefcf956c01ffcd8cfe798ff07f Mon Sep 17 00:00:00 2001 From: Michael LIAO Date: Mon, 11 May 2020 10:12:33 -0400 Subject: [PATCH] [hip] Fix `-Wduplicate-decl-specifier` warning. NFC. Change-Id: Iae48bbb7805c39f1005c920df8e76504426f2d3b --- 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 11985c3242..494685e261 100644 --- a/hipamd/include/hip/hcc_detail/math_functions.h +++ b/hipamd/include/hip/hcc_detail/math_functions.h @@ -1411,12 +1411,12 @@ float func(float x, int y) \ __DEF_FLOAT_FUN2I(scalbn) template -__DEVICE__ inline static T min(T arg1, T arg2) { +__DEVICE__ inline T min(T arg1, T arg2) { return (arg1 < arg2) ? arg1 : arg2; } template -__DEVICE__ inline static T max(T arg1, T arg2) { +__DEVICE__ inline T max(T arg1, T arg2) { return (arg1 > arg2) ? arg1 : arg2; }