From: khizmax <libcds.dev@gmail.com>
Date: Wed, 24 Sep 2014 04:45:24 +0000 (+0400)
Subject: Refactoring bugfix
X-Git-Tag: v2.0.0~300
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=12d430936464f92a7160529940ba0b6f4de9fcc3;p=libcds.git

Refactoring bugfix
---

diff --git a/cds/container/details/make_split_list_set.h b/cds/container/details/make_split_list_set.h
index 1a5d02e3..396e2bdd 100644
--- 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 0bf9cabc..0ff4c673 100644
--- 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 0b57040f..9412ebc6 100644
--- 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" />
     <ClInclude Include="..\..\..\cds\container\details\make_skip_list_map.h" />
     <ClInclude Include="..\..\..\cds\container\details\make_skip_list_set.h" />
+    <ClInclude Include="..\..\..\cds\container\details\make_split_list_set.h" />
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_base.h" />
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_map_hp.h" />
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_map_impl.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 94a31d44..b5de3f4b 100644
--- 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">
       <Filter>Header Files\cds\lock</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\cds\container\details\make_split_list_set.h">
+      <Filter>Header Files\cds\container\details</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file