Replace variadic template emulation for option list with native template (remove...

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

diff --git a/cds/container/striped_map/std_list.h b/cds/container/striped_map/std_list.h
index 06cf2107f54f6bf8c23af749ad86af91bec63cf7..914dacbac043cb2aa20dc4ce7b86d946c4cc85dd 100644 (file)
--- a/cds/container/striped_map/std_list.h
+++ b/cds/container/striped_map/std_list.h
@@ -62,8 +62,8 @@ namespace cds { namespace container {
 namespace cds { namespace intrusive { namespace striped_set {
 
     /// std::list adapter for hash map bucket
-    template <typename Key, typename T, class Alloc, CDS_SPEC_OPTIONS>
-    class adapt< std::list< std::pair<Key const, T>, Alloc>, CDS_OPTIONS >
+    template <typename Key, typename T, class Alloc, typename... Options>
+    class adapt< std::list< std::pair<Key const, T>, Alloc>, Options... >
     {
     public:
         typedef std::list< std::pair<Key const, T>, Alloc>     container_type          ;   ///< underlying container type
@@ -84,14 +84,14 @@ namespace cds { namespace intrusive { namespace striped_set {
 
         private:
             //@cond
-            typedef typename cds::opt::details::make_comparator_from_option_list< value_type, CDS_OPTIONS >::type key_comparator;
+            typedef typename cds::opt::details::make_comparator_from_option_list< value_type, Options... >::type key_comparator;
 
 
             typedef typename cds::opt::select<
                 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>