projects
/
libcds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aedb7b0
)
Fix compiler warnings for padding option
author
khizmax
<libcds.dev@gmail.com>
Mon, 3 Nov 2014 18:16:43 +0000
(21:16 +0300)
committer
khizmax
<libcds.dev@gmail.com>
Mon, 3 Nov 2014 18:16:43 +0000
(21:16 +0300)
cds/opt/options.h
patch
|
blob
|
history
diff --git
a/cds/opt/options.h
b/cds/opt/options.h
index 458a9102ba7e053900f10733691d02e80b446833..ecd6ea68653301aab1edae5f6317259a3573a1b7 100644
(file)
--- 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
//@endcond
/// Special padding constants for \p cds::opt::padding option
- enum special_pading {
+ enum special_pad
d
ing {
no_special_padding = 0, ///< no special padding
cache_line_padding = 1, ///< use cache line size defined in cds/user_setup/cache_line.h
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 =
public:
static CDS_CONSTEXPR const size_t c_nPadding =
-
padding == cache_line_padding
? cds::c_nCacheLineSize :
-
padding == no_special_padding ? 0 : padding
;
+
static_cast<unsigned int>(padding) == static_cast<unsigned int>(cache_line_padding)
? cds::c_nCacheLineSize :
+
static_cast<unsigned int>(padding) == static_cast<unsigned int>(no_special_padding) ? 0 : padding
;
static_assert( (c_nPadding & (c_nPadding - 1)) == 0, "Padding must be a power-of-two number" );
static_assert( (c_nPadding & (c_nPadding - 1)) == 0, "Padding must be a power-of-two number" );