projects
/
libcds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed ambiguity in casting size_t to one of unsigned type (found in AIX 32bit target)
[libcds.git]
/
cds
/
intrusive
/
details
/
split_list_base.h
diff --git
a/cds/intrusive/details/split_list_base.h
b/cds/intrusive/details/split_list_base.h
index e4ef11adf928aa909927a14941bba0ad41a61618..ce7c299ef57b9cbba1777676a9ee03cc1ee9f8fe 100644
(file)
--- a/
cds/intrusive/details/split_list_base.h
+++ b/
cds/intrusive/details/split_list_base.h
@@
-39,6
+39,7
@@
#include <cds/algo/bitop.h>
#include <cds/opt/hash.h>
#include <cds/intrusive/free_list_selector.h>
#include <cds/algo/bitop.h>
#include <cds/opt/hash.h>
#include <cds/intrusive/free_list_selector.h>
+#include <cds/details/size_t_cast.h>
namespace cds { namespace intrusive {
namespace cds { namespace intrusive {
@@
-1302,13
+1303,13
@@
namespace cds { namespace intrusive {
template <typename BitReversalAlgo>
static inline size_t regular_hash( size_t nHash )
{
template <typename BitReversalAlgo>
static inline size_t regular_hash( size_t nHash )
{
- return
BitReversalAlgo()( nHash
) | size_t(1);
+ return
static_cast<size_t>( BitReversalAlgo()( cds::details::size_t_cast( nHash ))
) | size_t(1);
}
template <typename BitReversalAlgo>
static inline size_t dummy_hash( size_t nHash )
{
}
template <typename BitReversalAlgo>
static inline size_t dummy_hash( size_t nHash )
{
- return
BitReversalAlgo()( nHash
) & ~size_t(1);
+ return
static_cast<size_t>( BitReversalAlgo()( cds::details::size_t_cast( nHash ))
) & ~size_t(1);
}
//@endcond
}
//@endcond