Replace CDS_BOOST_INTRUSIVE_OPTIONSx, CDS_BOOST_INTRUSIVE_DECL_OPTIONSx with variadic...

diff --git a/cds/intrusive/striped_set/adapter.h b/cds/intrusive/striped_set/adapter.h
index ec1cfa4828176b7dd1dfd02f9a3e681c7d8d8667..26ba7542bd005f8ad48128aa62c211fafe677486 100644 (file)
--- a/cds/intrusive/striped_set/adapter.h
+++ b/cds/intrusive/striped_set/adapter.h
@@ -329,43 +329,7 @@ namespace cds { namespace intrusive {
 }} // namespace cds::intrusive
 
 //@cond
-#if defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
-#   define CDS_BOOST_INTRUSIVE_DECL_OPTIONS3    typename... BIOptions
-#   define CDS_BOOST_INTRUSIVE_DECL_OPTIONS4    typename... BIOptions
-#   define CDS_BOOST_INTRUSIVE_DECL_OPTIONS5    typename... BIOptions
-#   define CDS_BOOST_INTRUSIVE_DECL_OPTIONS6    typename... BIOptions
-#   define CDS_BOOST_INTRUSIVE_DECL_OPTIONS7    typename... BIOptions
-#   define CDS_BOOST_INTRUSIVE_DECL_OPTIONS8    typename... BIOptions
-#   define CDS_BOOST_INTRUSIVE_DECL_OPTIONS9    typename... BIOptions
-#   define CDS_BOOST_INTRUSIVE_DECL_OPTIONS10    typename... BIOptions
-
-#   define CDS_BOOST_INTRUSIVE_OPTIONS3    BIOptions...
-#   define CDS_BOOST_INTRUSIVE_OPTIONS4    BIOptions...
-#   define CDS_BOOST_INTRUSIVE_OPTIONS5    BIOptions...
-#   define CDS_BOOST_INTRUSIVE_OPTIONS6    BIOptions...
-#   define CDS_BOOST_INTRUSIVE_OPTIONS7    BIOptions...
-#   define CDS_BOOST_INTRUSIVE_OPTIONS8    BIOptions...
-#   define CDS_BOOST_INTRUSIVE_OPTIONS9    BIOptions...
-#   define CDS_BOOST_INTRUSIVE_OPTIONS10    BIOptions...
-#else
-#   define CDS_BOOST_INTRUSIVE_DECL_OPTIONS3    typename BIO1, typename BIO2, typename BIO3
-#   define CDS_BOOST_INTRUSIVE_DECL_OPTIONS4    CDS_BOOST_INTRUSIVE_DECL_OPTIONS3, typename BIO4
-#   define CDS_BOOST_INTRUSIVE_DECL_OPTIONS5    CDS_BOOST_INTRUSIVE_DECL_OPTIONS4, typename BIO5
-#   define CDS_BOOST_INTRUSIVE_DECL_OPTIONS6    CDS_BOOST_INTRUSIVE_DECL_OPTIONS5, typename BIO6
-#   define CDS_BOOST_INTRUSIVE_DECL_OPTIONS7    CDS_BOOST_INTRUSIVE_DECL_OPTIONS6, typename BIO7
-#   define CDS_BOOST_INTRUSIVE_DECL_OPTIONS8    CDS_BOOST_INTRUSIVE_DECL_OPTIONS7, typename BIO8
-#   define CDS_BOOST_INTRUSIVE_DECL_OPTIONS9    CDS_BOOST_INTRUSIVE_DECL_OPTIONS8, typename BIO9
-#   define CDS_BOOST_INTRUSIVE_DECL_OPTIONS10   CDS_BOOST_INTRUSIVE_DECL_OPTIONS9, typename BIO10
-
-#   define CDS_BOOST_INTRUSIVE_OPTIONS3    BIO1,BIO2,BIO3
-#   define CDS_BOOST_INTRUSIVE_OPTIONS4    CDS_BOOST_INTRUSIVE_OPTIONS3, BIO4
-#   define CDS_BOOST_INTRUSIVE_OPTIONS5    CDS_BOOST_INTRUSIVE_OPTIONS4, BIO5
-#   define CDS_BOOST_INTRUSIVE_OPTIONS6    CDS_BOOST_INTRUSIVE_OPTIONS5, BIO6
-#   define CDS_BOOST_INTRUSIVE_OPTIONS7    CDS_BOOST_INTRUSIVE_OPTIONS6, BIO7
-#   define CDS_BOOST_INTRUSIVE_OPTIONS8    CDS_BOOST_INTRUSIVE_OPTIONS7, BIO8
-#   define CDS_BOOST_INTRUSIVE_OPTIONS9    CDS_BOOST_INTRUSIVE_OPTIONS8, BIO9
-#   define CDS_BOOST_INTRUSIVE_OPTIONS10   CDS_BOOST_INTRUSIVE_OPTIONS9, BIO10
-#endif
+//#if defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
 //@endcond
 
 #endif // #ifndef __CDS_INTRUSIVE_STRIPED_SET_ADAPTER_H

diff --git a/cds/intrusive/striped_set/boost_avl_set.h b/cds/intrusive/striped_set/boost_avl_set.h
index 683ce450c97e53120b913c462c3c3b908fe171d2..82ce92ed27476ab6e455ccaf216765cc5b33b51b 100644 (file)
--- a/cds/intrusive/striped_set/boost_avl_set.h
+++ b/cds/intrusive/striped_set/boost_avl_set.h
@@ -9,11 +9,11 @@
 //@cond
 namespace cds { namespace intrusive { namespace striped_set {
 
-    template <typename T, CDS_BOOST_INTRUSIVE_DECL_OPTIONS4, typename... Options>
-    class adapt< boost::intrusive::avl_set< T, CDS_BOOST_INTRUSIVE_OPTIONS4 >, Options... >
+    template <typename T, typename... BIOptons, typename... Options>
+    class adapt< boost::intrusive::avl_set< T, BIOptons... >, Options... >
     {
     public:
-        typedef boost::intrusive::avl_set< T, CDS_BOOST_INTRUSIVE_OPTIONS4 >  container_type  ;   ///< underlying intrusive container type
+        typedef boost::intrusive::avl_set< T, BIOptons... >  container_type  ;   ///< underlying intrusive container type
 
     public:
         typedef details::boost_intrusive_set_adapter<container_type>   type ;  ///< Result of the metafunction

diff --git a/cds/intrusive/striped_set/boost_list.h b/cds/intrusive/striped_set/boost_list.h
index 84209db47b3595cbc267f14f790c1bc9a706c504..54beb6af525060b10ef18669b863462377e9978a 100644 (file)
--- a/cds/intrusive/striped_set/boost_list.h
+++ b/cds/intrusive/striped_set/boost_list.h
@@ -9,11 +9,11 @@
 //@cond
 namespace cds { namespace intrusive { namespace striped_set {
 
-    template <typename T, CDS_BOOST_INTRUSIVE_DECL_OPTIONS3, typename... Options>
-    class adapt< boost::intrusive::list< T, CDS_BOOST_INTRUSIVE_OPTIONS3 >, Options... >
+    template <typename T, typename... BIOptons, typename... Options>
+    class adapt< boost::intrusive::list< T, BIOptons... >, Options... >
     {
     public:
-        typedef boost::intrusive::list< T, CDS_BOOST_INTRUSIVE_OPTIONS3 >  container_type  ;   ///< underlying intrusive container type
+        typedef boost::intrusive::list< T, BIOptons... >  container_type  ;   ///< underlying intrusive container type
 
     private:
         /// Adapted intrusive container

diff --git a/cds/intrusive/striped_set/boost_set.h b/cds/intrusive/striped_set/boost_set.h
index 554c85c1c3f56915062fd2422a3833d956617453..a92b69013101e8bc5d3f9ac4a320bb37b8fc3599 100644 (file)
--- a/cds/intrusive/striped_set/boost_set.h
+++ b/cds/intrusive/striped_set/boost_set.h
@@ -9,11 +9,11 @@
 //@cond
 namespace cds { namespace intrusive { namespace striped_set {
 
-    template <typename T, CDS_BOOST_INTRUSIVE_DECL_OPTIONS4, typename... Options>
-    class adapt< boost::intrusive::set< T, CDS_BOOST_INTRUSIVE_OPTIONS4 >, Options... >
+    template <typename T, typename... BIOptons, typename... Options>
+    class adapt< boost::intrusive::set< T, BIOptons... >, Options... >
     {
     public:
-        typedef boost::intrusive::set< T, CDS_BOOST_INTRUSIVE_OPTIONS4 >  container_type  ;   ///< underlying intrusive container type
+        typedef boost::intrusive::set< T, BIOptons... >  container_type  ;   ///< underlying intrusive container type
 
     public:
         typedef details::boost_intrusive_set_adapter<container_type>   type ;  ///< Result of the metafunction

diff --git a/cds/intrusive/striped_set/boost_sg_set.h b/cds/intrusive/striped_set/boost_sg_set.h
index f5a88c74c1b3d750a989fdaf09eafb7db6d07aff..b924bca6ea9ba2ac0470d1e73f3d35bb6acad4e8 100644 (file)
--- a/cds/intrusive/striped_set/boost_sg_set.h
+++ b/cds/intrusive/striped_set/boost_sg_set.h
@@ -9,11 +9,11 @@
 //@cond
 namespace cds { namespace intrusive { namespace striped_set {
 
-    template <typename T, CDS_BOOST_INTRUSIVE_DECL_OPTIONS4, typename... Options>
-    class adapt< boost::intrusive::sg_set< T, CDS_BOOST_INTRUSIVE_OPTIONS4 >, Options... >
+    template <typename T, typename... BIOptons, typename... Options>
+    class adapt< boost::intrusive::sg_set< T, BIOptons... >, Options... >
     {
     public:
-        typedef boost::intrusive::sg_set< T, CDS_BOOST_INTRUSIVE_OPTIONS4 >  container_type  ;   ///< underlying intrusive container type
+        typedef boost::intrusive::sg_set< T, BIOptons... >  container_type  ;   ///< underlying intrusive container type
 
     public:
         typedef details::boost_intrusive_set_adapter<container_type>   type ;  ///< Result of the metafunction

diff --git a/cds/intrusive/striped_set/boost_slist.h b/cds/intrusive/striped_set/boost_slist.h
index d677ca834d395824107786dda7e6a15c33c5bb84..c42a763a8b2770ae41392d8e27046bb7919bde55 100644 (file)
--- a/cds/intrusive/striped_set/boost_slist.h
+++ b/cds/intrusive/striped_set/boost_slist.h
@@ -9,11 +9,11 @@
 //@cond
 namespace cds { namespace intrusive { namespace striped_set {
 
-    template <typename T, CDS_BOOST_INTRUSIVE_DECL_OPTIONS5, typename... Options>
-    class adapt< boost::intrusive::slist< T, CDS_BOOST_INTRUSIVE_OPTIONS5 >, Options... >
+    template <typename T, typename... BIOptons, typename... Options>
+    class adapt< boost::intrusive::slist< T, BIOptons... >, Options... >
     {
     public:
-        typedef boost::intrusive::slist< T, CDS_BOOST_INTRUSIVE_OPTIONS5 >  container_type  ;   ///< underlying intrusive container type
+        typedef boost::intrusive::slist< T, BIOptons... >  container_type  ;   ///< underlying intrusive container type
 
     private:
         /// Adapted intrusive container

diff --git a/cds/intrusive/striped_set/boost_splay_set.h b/cds/intrusive/striped_set/boost_splay_set.h
index 99e4f74c0c5d0a8c35c5f1e534748a12b8d9714e..0bd769ff525bd8ce7d7c70867d2ff16d8b43dc06 100644 (file)
--- a/cds/intrusive/striped_set/boost_splay_set.h
+++ b/cds/intrusive/striped_set/boost_splay_set.h
@@ -9,11 +9,11 @@
 //@cond
 namespace cds { namespace intrusive { namespace striped_set {
 
-    template <typename T, CDS_BOOST_INTRUSIVE_DECL_OPTIONS4, typename... Options>
-    class adapt< boost::intrusive::splay_set< T, CDS_BOOST_INTRUSIVE_OPTIONS4 >, Options... >
+    template <typename T, typename... BIOptons, typename... Options>
+    class adapt< boost::intrusive::splay_set< T, BIOptons... >, Options... >
     {
     public:
-        typedef boost::intrusive::splay_set< T, CDS_BOOST_INTRUSIVE_OPTIONS4 >  container_type  ;   ///< underlying intrusive container type
+        typedef boost::intrusive::splay_set< T, BIOptons... >  container_type  ;   ///< underlying intrusive container type
 
     public:
         typedef details::boost_intrusive_set_adapter<container_type>   type ;  ///< Result of the metafunction

diff --git a/cds/intrusive/striped_set/boost_treap_set.h b/cds/intrusive/striped_set/boost_treap_set.h
index a4ea7666cafa0313862b0e0947bcb8406f3184a3..9df0f682d86955035ccc16a88ce47a73329135a5 100644 (file)
--- a/cds/intrusive/striped_set/boost_treap_set.h
+++ b/cds/intrusive/striped_set/boost_treap_set.h
@@ -9,11 +9,11 @@
 //@cond
 namespace cds { namespace intrusive { namespace striped_set {
 
-    template <typename T, CDS_BOOST_INTRUSIVE_DECL_OPTIONS4, typename... Options>
-    class adapt< boost::intrusive::treap_set< T, CDS_BOOST_INTRUSIVE_OPTIONS4 >, Options... >
+    template <typename T, typename... BIOptons, typename... Options>
+    class adapt< boost::intrusive::treap_set< T, BIOptons... >, Options... >
     {
     public:
-        typedef boost::intrusive::treap_set< T, CDS_BOOST_INTRUSIVE_OPTIONS4 >  container_type  ;   ///< underlying intrusive container type
+        typedef boost::intrusive::treap_set< T, BIOptons... >  container_type  ;   ///< underlying intrusive container type
 
     public:
         typedef details::boost_intrusive_set_adapter<container_type>   type ;  ///< Result of the metafunction

diff --git a/cds/intrusive/striped_set/boost_unordered_set.h b/cds/intrusive/striped_set/boost_unordered_set.h
index 9c3cb74d1ddf51eeac53f8b8e5f2fd107ec001b0..24464cfc5df0fb5ad88c65d896ebbd659c8ed524 100644 (file)
--- a/cds/intrusive/striped_set/boost_unordered_set.h
+++ b/cds/intrusive/striped_set/boost_unordered_set.h
@@ -10,11 +10,11 @@
 //@cond
 namespace cds { namespace intrusive { namespace striped_set {
 
-    template <typename T, CDS_BOOST_INTRUSIVE_DECL_OPTIONS10, typename... Options>
-    class adapt< boost::intrusive::unordered_set< T, CDS_BOOST_INTRUSIVE_OPTIONS10 >, Options... >
+    template <typename T, typename... BIOptons, typename... Options>
+    class adapt< boost::intrusive::unordered_set< T, BIOptons... >, Options... >
     {
     public:
-        typedef boost::intrusive::unordered_set< T, CDS_BOOST_INTRUSIVE_OPTIONS10 >  container_type  ;   ///< underlying intrusive container type
+        typedef boost::intrusive::unordered_set< T, BIOptons... >  container_type  ;   ///< underlying intrusive container type
 
     private:
         class adapted_container