From f1bd59e2a76421b3148f048fb748aa6d00c2eb32 Mon Sep 17 00:00:00 2001 From: khizmax Date: Sun, 29 Nov 2015 12:36:38 +0300 Subject: [PATCH] Fixed MSVC 14 incompatibility --- cds/intrusive/details/feldman_hashset_base.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cds/intrusive/details/feldman_hashset_base.h b/cds/intrusive/details/feldman_hashset_base.h index 55465466..11abc4c5 100644 --- 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; -- 2.34.1