improve docs and fix typo

[libcds.git] / cds / container / striped_map / std_hash_map_std.h

diff --git a/cds/container/striped_map/std_hash_map_std.h b/cds/container/striped_map/std_hash_map_std.h
index 4aec8052385cf5fc8107a24df21eb78c92dc624c..30b12d0af57e03772e372f3af4f0b681c8ed9259 100644 (file)
--- a/cds/container/striped_map/std_hash_map_std.h
+++ b/cds/container/striped_map/std_hash_map_std.h
@@ -64,8 +64,8 @@ namespace cds { namespace container {
 namespace cds { namespace intrusive { namespace striped_set {
 
     /// std::unordered_map  adapter for hash map bucket
-    template <typename Key, typename T, class Hash, class Pred, class Alloc, CDS_SPEC_OPTIONS>
-    class adapt< std::unordered_map< Key, T, Hash, Pred, Alloc>, CDS_OPTIONS >
+    template <typename Key, typename T, class Hash, class Pred, class Alloc, typename... Options>
+    class adapt< std::unordered_map< Key, T, Hash, Pred, Alloc>, Options... >
     {
     public:
         typedef std::unordered_map< Key, T, Hash, Pred, Alloc>  container_type  ;   ///< underlying container type
@@ -90,7 +90,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>
@@ -110,7 +110,7 @@ namespace cds { namespace intrusive { namespace striped_set {
             {
                 std::pair<iterator, bool> res = m_Map.insert( value_type( key, mapped_type() ));
                 if ( res.second )
-                    ::cds::unref(f)( const_cast<value_type&>(*res.first) );
+                    f( const_cast<value_type&>(*res.first) );
                 return res.second;
             }
 
@@ -125,7 +125,7 @@ namespace cds { namespace intrusive { namespace striped_set {
             std::pair<bool, bool> ensure( const Q& key, Func func )
             {
                 std::pair<iterator, bool> res = m_Map.insert( value_type( key, mapped_type() ) );
-                cds::unref(func)( res.second, const_cast<value_type&>(*res.first));
+                func( res.second, const_cast<value_type&>(*res.first));
                 return std::make_pair( true, res.second );
             }
 
@@ -135,7 +135,7 @@ namespace cds { namespace intrusive { namespace striped_set {
                 iterator it = m_Map.find( key_type(key) );
                 if ( it == m_Map.end() )
                     return false;
-                ::cds::unref(f)( const_cast<value_type&>(*it) );
+                f( const_cast<value_type&>(*it) );
                 m_Map.erase( it );
                 return true;
             }
@@ -146,7 +146,7 @@ namespace cds { namespace intrusive { namespace striped_set {
                 iterator it = m_Map.find( key_type(val) );
                 if ( it == m_Map.end() )
                     return false;
-                ::cds::unref(f)( const_cast<value_type&>(*it), val );
+                f( const_cast<value_type&>(*it), val );
                 return true;
             }