Replace cds::ref/boost::ref with std::ref, remove cds::unref and cds/ref.h header

[libcds.git] / cds / container / striped_set / std_hash_set_vc.h

diff --git a/cds/container/striped_set/std_hash_set_vc.h b/cds/container/striped_set/std_hash_set_vc.h
index 40b197f38bcb788674119743229f39dec9e09ac2..765a0698538db118e86faba3a64226565d6dcce6 100644 (file)
--- a/cds/container/striped_set/std_hash_set_vc.h
+++ b/cds/container/striped_set/std_hash_set_vc.h
@@ -50,8 +50,8 @@ namespace cds { namespace container {
 namespace cds { namespace intrusive { namespace striped_set {
 
     /// std::unordered_set  adapter for hash set bucket
-    template <typename T, class Traits, class Alloc, CDS_SPEC_OPTIONS>
-    class adapt< stdext::hash_set<T, Traits, Alloc>, CDS_OPTIONS >
+    template <typename T, class Traits, class Alloc, typename... Options>
+    class adapt< stdext::hash_set<T, Traits, Alloc>, Options... >
     {
     public:
         typedef stdext::hash_set<T, Traits, Alloc>  container_type  ;   ///< underlying container type
@@ -74,7 +74,7 @@ namespace cds { namespace intrusive { namespace striped_set {
                 typename cds::opt::value<
                     typename cds::opt::find_option<
                         cds::opt::copy_policy< cds::container::striped_set::move_item >
-                        , CDS_OPTIONS
+                        , Options...
                     >::type
                 >::copy_policy
                 , cds::container::striped_set::copy_item, cds::container::striped_set::copy_item_policy<container_type>
@@ -95,7 +95,7 @@ namespace cds { namespace intrusive { namespace striped_set {
             {
                 std::pair<iterator, bool> res = m_Set.insert( value_type(val) );
                 if ( res.second )
-                    ::cds::unref(f)( *res.first );
+                    ::f( *res.first );
                 return res.second;
             }
 
@@ -103,7 +103,7 @@ namespace cds { namespace intrusive { namespace striped_set {
             std::pair<bool, bool> ensure( const Q& val, Func func )
             {
                 std::pair<iterator, bool> res = m_Set.insert( value_type(val) );
-                ::cds::unref(func)( res.second, *res.first, val );
+                ::func( res.second, *res.first, val );
                 return std::make_pair( true, res.second );
             }
 
@@ -113,7 +113,7 @@ namespace cds { namespace intrusive { namespace striped_set {
                 iterator it = m_Set.find( value_type(key) );
                 if ( it == m_Set.end() )
                     return false;
-                ::cds::unref(f)( *it );
+                ::f( *it );
                 m_Set.erase( it );
                 return true;
             }
@@ -124,7 +124,7 @@ namespace cds { namespace intrusive { namespace striped_set {
                 iterator it = m_Set.find( value_type(val) );
                 if ( it == m_Set.end() )
                     return false;
-                ::cds::unref(f)( *it, val );
+                ::f( *it, val );
                 return true;
             }