From bc28b305e538774eae4152b300cd323e9a724393 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Mon, 20 Feb 2017 11:36:33 +1100 Subject: [PATCH] Remove warning: unused variable 'volatile_var' [-Wunused-variable] This occured in gcc-6.2.1. The variable wasn't used so was no need to be volatile either. Signed-off-by: Daniel Black --- storage/innobase/include/ut0ut.h | 4 +--- storage/xtradb/include/ut0ut.h | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/storage/innobase/include/ut0ut.h b/storage/innobase/include/ut0ut.h index 6786ad166e8..cdf517ce176 100644 --- a/storage/innobase/include/ut0ut.h +++ b/storage/innobase/include/ut0ut.h @@ -90,9 +90,7 @@ private: # define UT_RELAX_CPU() YieldProcessor() # elif defined(__powerpc__) #include -# define UT_RELAX_CPU() do { \ - volatile lint volatile_var = __ppc_get_timebase(); \ - } while (0) +# define UT_RELAX_CPU() __ppc_get_timebase() # else # define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */ # endif diff --git a/storage/xtradb/include/ut0ut.h b/storage/xtradb/include/ut0ut.h index 2df6bf58e6a..5fba1c7f547 100644 --- a/storage/xtradb/include/ut0ut.h +++ b/storage/xtradb/include/ut0ut.h @@ -87,9 +87,7 @@ private: # define UT_RELAX_CPU() YieldProcessor() # elif defined(__powerpc__) #include -# define UT_RELAX_CPU() do { \ - volatile lint volatile_var = __ppc_get_timebase(); \ - } while (0) +# define UT_RELAX_CPU() __ppc_get_timebase() # else # define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */ # endif