Refactoring bugfix

diff --git a/cds/container/details/make_split_list_set.h b/cds/container/details/make_split_list_set.h
index 1a5d02e3091996fac70f0eec2a30a0b3d4807040..396e2bddcffc70a8070d52f1230295c226e08bc4 100644 (file)
--- a/cds/container/details/make_split_list_set.h
+++ b/cds/container/details/make_split_list_set.h
@@ -40,14 +40,12 @@ namespace cds { namespace container {
                 explicit node_type( Q const& v )
                     : m_Value(v)
                 {}
-#       ifdef CDS_EMPLACE_SUPPORT
                 template <typename Q, typename... Args>
                 explicit node_type( Q&& q, Args&&... args )
                     : m_Value( std::forward<Q>(q), std::forward<Args>(args)... )
                 {}
-#       endif
-            private:
-                node_type() ;   // no default ctor
+
+                node_type() = delete;
             };
 
             typedef typename cds::opt::select_default<
@@ -150,14 +148,12 @@ namespace cds { namespace container {
                     : m_Value(v)
                 {}
 
-#       ifdef CDS_EMPLACE_SUPPORT
                 template <typename Q, typename... Args>
                 explicit node_type( Q&& q, Args&&... args )
                     : m_Value( std::forward<Q>(q), std::forward<Args>(args)... )
                 {}
-#       endif
-            private:
-                node_type() ;   // no default ctor
+
+                node_type() = delete;
             };
 
             typedef typename cds::opt::select_default<

diff --git a/cds/intrusive/striped_set.h b/cds/intrusive/striped_set.h
index 0bf9cabc81be7253b530ff251532079276d6bdd6..0ff4c673d3dbab5dea7c9e9821fa7f8eb8946c60 100644 (file)
--- a/cds/intrusive/striped_set.h
+++ b/cds/intrusive/striped_set.h
@@ -472,7 +472,6 @@ namespace cds { namespace intrusive {
         {
             alloc_bucket_table( m_nBucketMask + 1 );
         }
-#endif
 
         /// Destructor destroys internal data
         ~StripedSet()

diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 0b57040f1bf396aae24dd982ee4319e0848d0fed..9412ebc63099ae6aad013146b5667dd8da088909 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -658,6 +658,7 @@
     <ClInclude Include="..\..\..\cds\container\details\guarded_ptr_cast.h" />\r
     <ClInclude Include="..\..\..\cds\container\details\make_skip_list_map.h" />\r
     <ClInclude Include="..\..\..\cds\container\details\make_skip_list_set.h" />\r
+    <ClInclude Include="..\..\..\cds\container\details\make_split_list_set.h" />\r
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_base.h" />\r
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_map_hp.h" />\r
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_map_impl.h" />\r

diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 94a31d4447921e04873d868761f796d5e4ce95c8..b5de3f4b9dc8806ccfb35417a7cd8fd7b59e3a06 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -1274,5 +1274,8 @@
     <ClInclude Include="..\..\..\cds\lock\scoped_lock.h">\r
       <Filter>Header Files\cds\lock</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\container\details\make_split_list_set.h">\r
+      <Filter>Header Files\cds\container\details</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file