feedc0de/boost_intrusive
1
0
Fork 0
forked from boostorg/intrusive
Code Pull Requests Activity

lib: extra template parameter to containers & makers, not used yet

Browse Source
This commit is contained in:
Matei David
2014-05-15 13:54:53 -04:00
parent 11ec15f45a
commit 3af2654eda
15 changed files with 138 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/boost/intrusive/avl_set.hpp
View File

@@ -397,7 +397,8 @@ void swap(avl_set_impl<T, Options...> &x, avl_set_impl<T, Options...> &y);
template<class T, class ...Options> template<class T, class ...Options>
#else #else
template<class T, class O1 = void, class O2 = void template<class T, class O1 = void, class O2 = void
, class O3 = void, class O4 = void> , class O3 = void, class O4 = void
, class O5 = void>
#endif #endif
struct make_avl_set struct make_avl_set
{ {
@@ -405,7 +406,7 @@ struct make_avl_set
typedef typename pack_options typedef typename pack_options
< avltree_defaults, < avltree_defaults,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -426,14 +427,14 @@ struct make_avl_set
#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class O1, class O2, class O3, class O4> template<class T, class O1, class O2, class O3, class O4, class O5>
#else #else
template<class T, class ...Options> template<class T, class ...Options>
#endif #endif
class avl_set class avl_set
: public make_avl_set<T, : public make_avl_set<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -442,7 +443,7 @@ class avl_set
typedef typename make_avl_set typedef typename make_avl_set
<T, <T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -834,7 +835,8 @@ void swap(avl_multiset_impl<T, Options...> &x, avl_multiset_impl<T, Options...>
template<class T, class ...Options> template<class T, class ...Options>
#else #else
template<class T, class O1 = void, class O2 = void template<class T, class O1 = void, class O2 = void
, class O3 = void, class O4 = void> , class O3 = void, class O4 = void
, class O5 = void>
#endif #endif
struct make_avl_multiset struct make_avl_multiset
{ {
@@ -842,7 +844,7 @@ struct make_avl_multiset
typedef typename pack_options typedef typename pack_options
< avltree_defaults, < avltree_defaults,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -864,14 +866,14 @@ struct make_avl_multiset
#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class O1, class O2, class O3, class O4> template<class T, class O1, class O2, class O3, class O4, class O5>
#else #else
template<class T, class ...Options> template<class T, class ...Options>
#endif #endif
class avl_multiset class avl_multiset
: public make_avl_multiset<T, : public make_avl_multiset<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -879,7 +881,7 @@ class avl_multiset
{ {
typedef typename make_avl_multiset<T, typedef typename make_avl_multiset<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif

11
include/boost/intrusive/avltree.hpp
View File

@@ -431,7 +431,8 @@ void swap(avltree_impl<T, Options...> &x, avltree_impl<T, Options...> &y);
template<class T, class ...Options> template<class T, class ...Options>
#else #else
template<class T, class O1 = void, class O2 = void template<class T, class O1 = void, class O2 = void
, class O3 = void, class O4 = void> , class O3 = void, class O4 = void
, class O5 = void>
#endif #endif
struct make_avltree struct make_avltree
{ {
@@ -439,7 +440,7 @@ struct make_avltree
typedef typename pack_options typedef typename pack_options
< avltree_defaults, < avltree_defaults,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -462,14 +463,14 @@ struct make_avltree
#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class O1, class O2, class O3, class O4> template<class T, class O1, class O2, class O3, class O4, class O5>
#else #else
template<class T, class ...Options> template<class T, class ...Options>
#endif #endif
class avltree class avltree
: public make_avltree<T, : public make_avltree<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -478,7 +479,7 @@ class avltree
typedef typename make_avltree typedef typename make_avltree
<T, <T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif

22
include/boost/intrusive/bs_set.hpp
View File

@@ -395,7 +395,8 @@ void swap(bs_set_impl<T, Options...> &x, bs_set_impl<T, Options...> &y);
template<class T, class ...Options> template<class T, class ...Options>
#else #else
template<class T, class O1 = void, class O2 = void template<class T, class O1 = void, class O2 = void
, class O3 = void, class O4 = void> , class O3 = void, class O4 = void
, class O5 = void>
#endif #endif
struct make_bs_set struct make_bs_set
{ {
@@ -403,7 +404,7 @@ struct make_bs_set
typedef typename pack_options typedef typename pack_options
< bstree_defaults, < bstree_defaults,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -424,14 +425,14 @@ struct make_bs_set
#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class O1, class O2, class O3, class O4> template<class T, class O1, class O2, class O3, class O4, class O5>
#else #else
template<class T, class ...Options> template<class T, class ...Options>
#endif #endif
class bs_set class bs_set
: public make_bs_set<T, : public make_bs_set<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -440,7 +441,7 @@ class bs_set
typedef typename make_bs_set typedef typename make_bs_set
<T, <T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -832,7 +833,8 @@ void swap(bs_multiset_impl<T, Options...> &x, bs_multiset_impl<T, Options...> &y
template<class T, class ...Options> template<class T, class ...Options>
#else #else
template<class T, class O1 = void, class O2 = void template<class T, class O1 = void, class O2 = void
, class O3 = void, class O4 = void> , class O3 = void, class O4 = void
, class O5 = void>
#endif #endif
struct make_bs_multiset struct make_bs_multiset
{ {
@@ -840,7 +842,7 @@ struct make_bs_multiset
typedef typename pack_options typedef typename pack_options
< bstree_defaults, < bstree_defaults,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -862,14 +864,14 @@ struct make_bs_multiset
#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class O1, class O2, class O3, class O4> template<class T, class O1, class O2, class O3, class O4, class O5>
#else #else
template<class T, class ...Options> template<class T, class ...Options>
#endif #endif
class bs_multiset class bs_multiset
: public make_bs_multiset<T, : public make_bs_multiset<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -877,7 +879,7 @@ class bs_multiset
{ {
typedef typename make_bs_multiset<T, typedef typename make_bs_multiset<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif

11
include/boost/intrusive/bstree.hpp
View File

@@ -2002,7 +2002,8 @@ inline void swap
template<class T, class ...Options> template<class T, class ...Options>
#else #else
template<class T, class O1 = void, class O2 = void template<class T, class O1 = void, class O2 = void
, class O3 = void, class O4 = void> , class O3 = void, class O4 = void
, class O5 = void>
#endif #endif
struct make_bstree struct make_bstree
{ {
@@ -2010,7 +2011,7 @@ struct make_bstree
typedef typename pack_options typedef typename pack_options
< bstree_defaults, < bstree_defaults,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -2034,14 +2035,14 @@ struct make_bstree
#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class O1, class O2, class O3, class O4> template<class T, class O1, class O2, class O3, class O4, class O5>
#else #else
template<class T, class ...Options> template<class T, class ...Options>
#endif #endif
class bstree class bstree
: public make_bstree<T, : public make_bstree<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -2050,7 +2051,7 @@ class bstree
typedef typename make_bstree typedef typename make_bstree
<T, <T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif

20
include/boost/intrusive/intrusive_fwd.hpp
View File

@@ -102,6 +102,7 @@ template
, class O3 = void , class O3 = void
, class O4 = void , class O4 = void
, class O5 = void , class O5 = void
, class O6 = void
> >
#else #else
template<class T, class ...Options> template<class T, class ...Options>
@@ -137,6 +138,7 @@ template
, class O1 = void , class O1 = void
, class O2 = void , class O2 = void
, class O3 = void , class O3 = void
, class O4 = void
> >
#else #else
template<class T, class ...Options> template<class T, class ...Options>
@@ -173,6 +175,7 @@ template
, class O2 = void , class O2 = void
, class O3 = void , class O3 = void
, class O4 = void , class O4 = void
, class O5 = void
> >
#else #else
template<class T, class ...Options> template<class T, class ...Options>
@@ -186,6 +189,7 @@ template
, class O2 = void , class O2 = void
, class O3 = void , class O3 = void
, class O4 = void , class O4 = void
, class O5 = void
> >
#else #else
template<class T, class ...Options> template<class T, class ...Options>
@@ -199,6 +203,7 @@ template
, class O2 = void , class O2 = void
, class O3 = void , class O3 = void
, class O4 = void , class O4 = void
, class O5 = void
> >
#else #else
template<class T, class ...Options> template<class T, class ...Options>
@@ -237,6 +242,7 @@ template
, class O2 = void , class O2 = void
, class O3 = void , class O3 = void
, class O4 = void , class O4 = void
, class O5 = void
> >
#else #else
template<class T, class ...Options> template<class T, class ...Options>
@@ -250,6 +256,7 @@ template
, class O2 = void , class O2 = void
, class O3 = void , class O3 = void
, class O4 = void , class O4 = void
, class O5 = void
> >
#else #else
template<class T, class ...Options> template<class T, class ...Options>
@@ -263,6 +270,7 @@ template
, class O2 = void , class O2 = void
, class O3 = void , class O3 = void
, class O4 = void , class O4 = void
, class O5 = void
> >
#else #else
template<class T, class ...Options> template<class T, class ...Options>
@@ -277,6 +285,7 @@ template
, class O2 = void , class O2 = void
, class O3 = void , class O3 = void
, class O4 = void , class O4 = void
, class O5 = void
> >
#else #else
template<class T, class ...Options> template<class T, class ...Options>
@@ -290,6 +299,7 @@ template
, class O2 = void , class O2 = void
, class O3 = void , class O3 = void
, class O4 = void , class O4 = void
, class O5 = void
> >
#else #else
template<class T, class ...Options> template<class T, class ...Options>
@@ -303,6 +313,7 @@ template
, class O2 = void , class O2 = void
, class O3 = void , class O3 = void
, class O4 = void , class O4 = void
, class O5 = void
> >
#else #else
template<class T, class ...Options> template<class T, class ...Options>
@@ -342,6 +353,7 @@ template
, class O2 = void , class O2 = void
, class O3 = void , class O3 = void
, class O4 = void , class O4 = void
, class O5 = void
> >
#else #else
template<class T, class ...Options> template<class T, class ...Options>
@@ -355,6 +367,7 @@ template
, class O2 = void , class O2 = void
, class O3 = void , class O3 = void
, class O4 = void , class O4 = void
, class O5 = void
> >
#else #else
template<class T, class ...Options> template<class T, class ...Options>
@@ -368,6 +381,7 @@ template
, class O2 = void , class O2 = void
, class O3 = void , class O3 = void
, class O4 = void , class O4 = void
, class O5 = void
> >
#else #else
template<class T, class ...Options> template<class T, class ...Options>
@@ -382,6 +396,7 @@ template
, class O2 = void , class O2 = void
, class O3 = void , class O3 = void
, class O4 = void , class O4 = void
, class O5 = void
> >
#else #else
template<class T, class ...Options> template<class T, class ...Options>
@@ -395,6 +410,7 @@ template
, class O2 = void , class O2 = void
, class O3 = void , class O3 = void
, class O4 = void , class O4 = void
, class O5 = void
> >
#else #else
template<class T, class ...Options> template<class T, class ...Options>
@@ -408,6 +424,7 @@ template
, class O2 = void , class O2 = void
, class O3 = void , class O3 = void
, class O4 = void , class O4 = void
, class O5 = void
> >
#else #else
template<class T, class ...Options> template<class T, class ...Options>
@@ -421,6 +438,7 @@ template
, class O2 = void , class O2 = void
, class O3 = void , class O3 = void
, class O4 = void , class O4 = void
, class O5 = void
> >
#else #else
template<class T, class ...Options> template<class T, class ...Options>
@@ -434,6 +452,7 @@ template
, class O2 = void , class O2 = void
, class O3 = void , class O3 = void
, class O4 = void , class O4 = void
, class O5 = void
> >
#else #else
template<class T, class ...Options> template<class T, class ...Options>
@@ -447,6 +466,7 @@ template
, class O2 = void , class O2 = void
, class O3 = void , class O3 = void
, class O4 = void , class O4 = void
, class O5 = void
> >
#else #else
template<class T, class ...Options> template<class T, class ...Options>

10
include/boost/intrusive/list.hpp
View File

@@ -1387,7 +1387,7 @@ inline void swap
#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) || defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) || defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class ...Options> template<class T, class ...Options>
#else #else
template<class T, class O1 = void, class O2 = void, class O3 = void> template<class T, class O1 = void, class O2 = void, class O3 = void, class O4 = void>
#endif #endif
struct make_list struct make_list
{ {
@@ -1395,7 +1395,7 @@ struct make_list
typedef typename pack_options typedef typename pack_options
< list_defaults, < list_defaults,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3 O1, O2, O3, O4
#else #else
Options... Options...
#endif #endif
@@ -1418,14 +1418,14 @@ struct make_list
#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class O1, class O2, class O3> template<class T, class O1, class O2, class O3, class O4>
#else #else
template<class T, class ...Options> template<class T, class ...Options>
#endif #endif
class list class list
: public make_list<T, : public make_list<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3 O1, O2, O3, O4
#else #else
Options... Options...
#endif #endif
@@ -1434,7 +1434,7 @@ class list
typedef typename make_list typedef typename make_list
<T, <T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3 O1, O2, O3, O4
#else #else
Options... Options...
#endif #endif

11
include/boost/intrusive/rbtree.hpp
View File

@@ -427,7 +427,8 @@ void swap(rbtree_impl<T, Options...> &x, rbtree_impl<T, Options...> &y);
template<class T, class ...Options> template<class T, class ...Options>
#else #else
template<class T, class O1 = void, class O2 = void template<class T, class O1 = void, class O2 = void
, class O3 = void, class O4 = void> , class O3 = void, class O4 = void
, class O5 = void>
#endif #endif
struct make_rbtree struct make_rbtree
{ {
@@ -435,7 +436,7 @@ struct make_rbtree
typedef typename pack_options typedef typename pack_options
< rbtree_defaults, < rbtree_defaults,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -458,14 +459,14 @@ struct make_rbtree
#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class O1, class O2, class O3, class O4> template<class T, class O1, class O2, class O3, class O4, class O5>
#else #else
template<class T, class ...Options> template<class T, class ...Options>
#endif #endif
class rbtree class rbtree
: public make_rbtree<T, : public make_rbtree<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -474,7 +475,7 @@ class rbtree
typedef typename make_rbtree typedef typename make_rbtree
<T, <T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif

22
include/boost/intrusive/set.hpp
View File

@@ -397,7 +397,8 @@ void swap(set_impl<T, Options...> &x, set_impl<T, Options...> &y);
template<class T, class ...Options> template<class T, class ...Options>
#else #else
template<class T, class O1 = void, class O2 = void template<class T, class O1 = void, class O2 = void
, class O3 = void, class O4 = void> , class O3 = void, class O4 = void
, class O5 = void>
#endif #endif
struct make_set struct make_set
{ {
@@ -405,7 +406,7 @@ struct make_set
typedef typename pack_options typedef typename pack_options
< rbtree_defaults, < rbtree_defaults,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -426,14 +427,14 @@ struct make_set
#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class O1, class O2, class O3, class O4> template<class T, class O1, class O2, class O3, class O4, class O5>
#else #else
template<class T, class ...Options> template<class T, class ...Options>
#endif #endif
class set class set
: public make_set<T, : public make_set<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -442,7 +443,7 @@ class set
typedef typename make_set typedef typename make_set
<T, <T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -834,7 +835,8 @@ void swap(multiset_impl<T, Options...> &x, multiset_impl<T, Options...> &y);
template<class T, class ...Options> template<class T, class ...Options>
#else #else
template<class T, class O1 = void, class O2 = void template<class T, class O1 = void, class O2 = void
, class O3 = void, class O4 = void> , class O3 = void, class O4 = void
, class O5 = void>
#endif #endif
struct make_multiset struct make_multiset
{ {
@@ -842,7 +844,7 @@ struct make_multiset
typedef typename pack_options typedef typename pack_options
< rbtree_defaults, < rbtree_defaults,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -864,14 +866,14 @@ struct make_multiset
#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class O1, class O2, class O3, class O4> template<class T, class O1, class O2, class O3, class O4, class O5>
#else #else
template<class T, class ...Options> template<class T, class ...Options>
#endif #endif
class multiset class multiset
: public make_multiset<T, : public make_multiset<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -879,7 +881,7 @@ class multiset
{ {
typedef typename make_multiset<T, typedef typename make_multiset<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif

22
include/boost/intrusive/sg_set.hpp
View File

@@ -408,7 +408,8 @@ void swap(sg_set_impl<T, Options...> &x, sg_set_impl<T, Options...> &y);
template<class T, class ...Options> template<class T, class ...Options>
#else #else
template<class T, class O1 = void, class O2 = void template<class T, class O1 = void, class O2 = void
, class O3 = void, class O4 = void> , class O3 = void, class O4 = void
, class O5 = void>
#endif #endif
struct make_sg_set struct make_sg_set
{ {
@@ -416,7 +417,7 @@ struct make_sg_set
typedef typename pack_options typedef typename pack_options
< sgtree_defaults, < sgtree_defaults,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -437,14 +438,14 @@ struct make_sg_set
#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class O1, class O2, class O3, class O4> template<class T, class O1, class O2, class O3, class O4, class O5>
#else #else
template<class T, class ...Options> template<class T, class ...Options>
#endif #endif
class sg_set class sg_set
: public make_sg_set<T, : public make_sg_set<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -453,7 +454,7 @@ class sg_set
typedef typename make_sg_set typedef typename make_sg_set
<T, <T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -858,7 +859,8 @@ void swap(sg_multiset_impl<T, Options...> &x, sg_multiset_impl<T, Options...> &y
template<class T, class ...Options> template<class T, class ...Options>
#else #else
template<class T, class O1 = void, class O2 = void template<class T, class O1 = void, class O2 = void
, class O3 = void, class O4 = void> , class O3 = void, class O4 = void
, class O5 = void>
#endif #endif
struct make_sg_multiset struct make_sg_multiset
{ {
@@ -866,7 +868,7 @@ struct make_sg_multiset
typedef typename pack_options typedef typename pack_options
< sgtree_defaults, < sgtree_defaults,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -888,14 +890,14 @@ struct make_sg_multiset
#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class O1, class O2, class O3, class O4> template<class T, class O1, class O2, class O3, class O4, class O5>
#else #else
template<class T, class ...Options> template<class T, class ...Options>
#endif #endif
class sg_multiset class sg_multiset
: public make_sg_multiset<T, : public make_sg_multiset<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -903,7 +905,7 @@ class sg_multiset
{ {
typedef typename make_sg_multiset<T, typedef typename make_sg_multiset<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif

11
include/boost/intrusive/sgtree.hpp
View File

@@ -873,7 +873,8 @@ void swap(sgtree_impl<T, Options...> &x, sgtree_impl<T, Options...> &y);
template<class T, class ...Options> template<class T, class ...Options>
#else #else
template<class T, class O1 = void, class O2 = void template<class T, class O1 = void, class O2 = void
, class O3 = void, class O4 = void> , class O3 = void, class O4 = void
, class O5 = void>
#endif #endif
struct make_sgtree struct make_sgtree
{ {
@@ -881,7 +882,7 @@ struct make_sgtree
typedef typename pack_options typedef typename pack_options
< sgtree_defaults, < sgtree_defaults,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -904,14 +905,14 @@ struct make_sgtree
#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class O1, class O2, class O3, class O4> template<class T, class O1, class O2, class O3, class O4, class O5>
#else #else
template<class T, class ...Options> template<class T, class ...Options>
#endif #endif
class sgtree class sgtree
: public make_sgtree<T, : public make_sgtree<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -920,7 +921,7 @@ class sgtree
typedef typename make_sgtree typedef typename make_sgtree
<T, <T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif

10
include/boost/intrusive/slist.hpp
View File

@@ -2098,7 +2098,7 @@ inline void swap
#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) || defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) || defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class ...Options> template<class T, class ...Options>
#else #else
template<class T, class O1 = void, class O2 = void, class O3 = void, class O4 = void, class O5 = void> template<class T, class O1 = void, class O2 = void, class O3 = void, class O4 = void, class O5 = void, class O6 = void>
#endif #endif
struct make_slist struct make_slist
{ {
@@ -2106,7 +2106,7 @@ struct make_slist
typedef typename pack_options typedef typename pack_options
< slist_defaults, < slist_defaults,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4, O5 O1, O2, O3, O4, O5, O6
#else #else
Options... Options...
#endif #endif
@@ -2128,14 +2128,14 @@ struct make_slist
#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class O1, class O2, class O3, class O4, class O5> template<class T, class O1, class O2, class O3, class O4, class O5, class O6>
#else #else
template<class T, class ...Options> template<class T, class ...Options>
#endif #endif
class slist class slist
: public make_slist<T, : public make_slist<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4, O5 O1, O2, O3, O4, O5, O6
#else #else
Options... Options...
#endif #endif
@@ -2144,7 +2144,7 @@ class slist
typedef typename make_slist typedef typename make_slist
<T, <T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4, O5 O1, O2, O3, O4, O5, O6
#else #else
Options... Options...
#endif #endif

22
include/boost/intrusive/splay_set.hpp
View File

@@ -418,7 +418,8 @@ void swap(splay_set_impl<T, Options...> &x, splay_set_impl<T, Options...> &y);
template<class T, class ...Options> template<class T, class ...Options>
#else #else
template<class T, class O1 = void, class O2 = void template<class T, class O1 = void, class O2 = void
, class O3 = void, class O4 = void> , class O3 = void, class O4 = void
, class O5 = void>
#endif #endif
struct make_splay_set struct make_splay_set
{ {
@@ -426,7 +427,7 @@ struct make_splay_set
typedef typename pack_options typedef typename pack_options
< splaytree_defaults, < splaytree_defaults,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -447,14 +448,14 @@ struct make_splay_set
#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class O1, class O2, class O3, class O4> template<class T, class O1, class O2, class O3, class O4, class O5>
#else #else
template<class T, class ...Options> template<class T, class ...Options>
#endif #endif
class splay_set class splay_set
: public make_splay_set<T, : public make_splay_set<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -463,7 +464,7 @@ class splay_set
typedef typename make_splay_set typedef typename make_splay_set
<T, <T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -871,7 +872,8 @@ void swap(splay_multiset_impl<T, Options...> &x, splay_multiset_impl<T, Options.
template<class T, class ...Options> template<class T, class ...Options>
#else #else
template<class T, class O1 = void, class O2 = void template<class T, class O1 = void, class O2 = void
, class O3 = void, class O4 = void> , class O3 = void, class O4 = void
, class O5 = void>
#endif #endif
struct make_splay_multiset struct make_splay_multiset
{ {
@@ -879,7 +881,7 @@ struct make_splay_multiset
typedef typename pack_options typedef typename pack_options
< splaytree_defaults, < splaytree_defaults,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -901,14 +903,14 @@ struct make_splay_multiset
#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class O1, class O2, class O3, class O4> template<class T, class O1, class O2, class O3, class O4, class O5>
#else #else
template<class T, class ...Options> template<class T, class ...Options>
#endif #endif
class splay_multiset class splay_multiset
: public make_splay_multiset<T, : public make_splay_multiset<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -916,7 +918,7 @@ class splay_multiset
{ {
typedef typename make_splay_multiset<T, typedef typename make_splay_multiset<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif

11
include/boost/intrusive/splaytree.hpp
View File

@@ -514,7 +514,8 @@ void swap(splaytree_impl<T, Options...> &x, splaytree_impl<T, Options...> &y);
template<class T, class ...Options> template<class T, class ...Options>
#else #else
template<class T, class O1 = void, class O2 = void template<class T, class O1 = void, class O2 = void
, class O3 = void, class O4 = void> , class O3 = void, class O4 = void
, class O5 = void>
#endif #endif
struct make_splaytree struct make_splaytree
{ {
@@ -522,7 +523,7 @@ struct make_splaytree
typedef typename pack_options typedef typename pack_options
< splaytree_defaults, < splaytree_defaults,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -545,14 +546,14 @@ struct make_splaytree
#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class O1, class O2, class O3, class O4> template<class T, class O1, class O2, class O3, class O4, class O5>
#else #else
template<class T, class ...Options> template<class T, class ...Options>
#endif #endif
class splaytree class splaytree
: public make_splaytree<T, : public make_splaytree<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -561,7 +562,7 @@ class splaytree
typedef typename make_splaytree typedef typename make_splaytree
<T, <T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif

11
include/boost/intrusive/treap.hpp
View File

@@ -1063,14 +1063,15 @@ void swap(treap_impl<T, Options...> &x, treap_impl<T, Options...> &y);
template<class T, class ...Options> template<class T, class ...Options>
#else #else
template<class T, class O1 = void, class O2 = void template<class T, class O1 = void, class O2 = void
, class O3 = void, class O4 = void> , class O3 = void, class O4 = void
, class O5 = void>
#endif #endif
struct make_treap struct make_treap
{ {
typedef typename pack_options typedef typename pack_options
< treap_defaults, < treap_defaults,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -1093,14 +1094,14 @@ struct make_treap
#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class O1, class O2, class O3, class O4> template<class T, class O1, class O2, class O3, class O4, class O5>
#else #else
template<class T, class ...Options> template<class T, class ...Options>
#endif #endif
class treap class treap
: public make_treap<T, : public make_treap<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -1109,7 +1110,7 @@ class treap
typedef typename make_treap typedef typename make_treap
<T, <T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif

22
include/boost/intrusive/treap_set.hpp
View File

@@ -423,14 +423,15 @@ class treap_set_impl
template<class T, class ...Options> template<class T, class ...Options>
#else #else
template<class T, class O1 = void, class O2 = void template<class T, class O1 = void, class O2 = void
, class O3 = void, class O4 = void> , class O3 = void, class O4 = void
, class O5 = void>
#endif #endif
struct make_treap_set struct make_treap_set
{ {
typedef typename pack_options typedef typename pack_options
< treap_defaults, < treap_defaults,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -453,14 +454,14 @@ struct make_treap_set
#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class O1, class O2, class O3, class O4> template<class T, class O1, class O2, class O3, class O4, class O5>
#else #else
template<class T, class ...Options> template<class T, class ...Options>
#endif #endif
class treap_set class treap_set
: public make_treap_set<T, : public make_treap_set<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -469,7 +470,7 @@ class treap_set
typedef typename make_treap_set typedef typename make_treap_set
<T, <T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -889,14 +890,15 @@ class treap_multiset_impl
template<class T, class ...Options> template<class T, class ...Options>
#else #else
template<class T, class O1 = void, class O2 = void template<class T, class O1 = void, class O2 = void
, class O3 = void, class O4 = void> , class O3 = void, class O4 = void
, class O5 = void>
#endif #endif
struct make_treap_multiset struct make_treap_multiset
{ {
typedef typename pack_options typedef typename pack_options
< treap_defaults, < treap_defaults,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -919,14 +921,14 @@ struct make_treap_multiset
#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
template<class T, class O1, class O2, class O3, class O4> template<class T, class O1, class O2, class O3, class O4, class O5>
#else #else
template<class T, class ...Options> template<class T, class ...Options>
#endif #endif
class treap_multiset class treap_multiset
: public make_treap_multiset<T, : public make_treap_multiset<T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif
@@ -935,7 +937,7 @@ class treap_multiset
typedef typename make_treap_multiset typedef typename make_treap_multiset
<T, <T,
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4 O1, O2, O3, O4, O5
#else #else
Options... Options...
#endif #endif