projects
/
libcds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7714220
)
Fixed MSVC 14 incompatibility
author
khizmax
<libcds.dev@gmail.com>
Sun, 29 Nov 2015 09:36:38 +0000
(12:36 +0300)
committer
khizmax
<libcds.dev@gmail.com>
Sun, 29 Nov 2015 09:36:38 +0000
(12:36 +0300)
cds/intrusive/details/feldman_hashset_base.h
patch
|
blob
|
history
diff --git
a/cds/intrusive/details/feldman_hashset_base.h
b/cds/intrusive/details/feldman_hashset_base.h
index 5546546644eade2b9449a28d59e077cfec49d7a7..11abc4c5cd818a7c9c580241d2b6a50a38f72c07 100644
(file)
--- a/
cds/intrusive/details/feldman_hashset_base.h
+++ b/
cds/intrusive/details/feldman_hashset_base.h
@@
-340,12
+340,13
@@
namespace cds { namespace intrusive {
typedef feldman_hashset::details::hash_splitter< hash_type > hash_splitter;
- protected:
enum node_flags {
flag_array_converting = 1, ///< the cell is converting from data node to an array node
flag_array_node = 2 ///< the cell is a pointer to an array node
};
+ protected:
+
typedef cds::details::marked_ptr< value_type, 3 > node_ptr;
typedef atomics::atomic< node_ptr > atomic_node_ptr;