From 028d82bdc915c23fb4c041164d2fcaa9da55bf36 Mon Sep 17 00:00:00 2001 From: khizmax Date: Mon, 3 Nov 2014 21:16:43 +0300 Subject: [PATCH] Fix compiler warnings for padding option --- cds/opt/options.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cds/opt/options.h b/cds/opt/options.h index 458a9102..ecd6ea68 100644 --- a/cds/opt/options.h +++ b/cds/opt/options.h @@ -399,7 +399,7 @@ namespace opt { //@endcond /// Special padding constants for \p cds::opt::padding option - enum special_pading { + enum special_padding { no_special_padding = 0, ///< no special padding cache_line_padding = 1, ///< use cache line size defined in cds/user_setup/cache_line.h @@ -498,8 +498,8 @@ namespace opt { public: static CDS_CONSTEXPR const size_t c_nPadding = - padding == cache_line_padding ? cds::c_nCacheLineSize : - padding == no_special_padding ? 0 : padding ; + static_cast(padding) == static_cast(cache_line_padding) ? cds::c_nCacheLineSize : + static_cast(padding) == static_cast(no_special_padding) ? 0 : padding; static_assert( (c_nPadding & (c_nPadding - 1)) == 0, "Padding must be a power-of-two number" ); -- 2.34.1