forked from boostorg/intrusive
Changes and fixes for Boost 1.37
[SVN r49322]
This commit is contained in:
1 parent
8e236cb98a
commit
2dd87072b7
35 files changed
+2283
-1029
No files matched your search
@@ -153,7 +153,7 @@ struct get_uset_node_algo
|
||||
|
||||
//! Helper metafunction to define a \c unordered_set_base_hook that yields to the same
|
||||
//! type when the same options (either explicitly or implicitly) are used.
|
||||
#ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
|
||||
#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) || defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
|
||||
template<class ...Options>
|
||||
#else
|
||||
template<class O1 = none, class O2 = none, class O3 = none, class O4 = none>
|
||||
@@ -162,7 +162,13 @@ struct make_unordered_set_base_hook
|
||||
{
|
||||
/// @cond
|
||||
typedef typename pack_options
|
||||
< hook_defaults, O1, O2, O3, O4>::type packed_options;
|
||||
< hook_defaults,
|
||||
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
|
||||
O1, O2, O3, O4
|
||||
#else
|
||||
Options...
|
||||
#endif
|
||||
>::type packed_options;
|
||||
|
||||
typedef detail::generic_hook
|
||||
< get_uset_node_algo<typename packed_options::void_pointer
|
||||
@@ -201,15 +207,21 @@ struct make_unordered_set_base_hook
|
||||
//! \c optimize_multikey<> will tell the hook to store a link to form a group
|
||||
//! with other value with the same value to speed up searches and insertions
|
||||
//! in unordered_multisets with a great number of with equivalent keys.
|
||||
#ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
|
||||
#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) || defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
|
||||
template<class ...Options>
|
||||
#else
|
||||
template<class O1, class O2, class O3, class O4>
|
||||
#endif
|
||||
class unordered_set_base_hook
|
||||
: public make_unordered_set_base_hook<O1, O2, O3, O4>::type
|
||||
: public make_unordered_set_base_hook<
|
||||
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
|
||||
O1, O2, O3, O4
|
||||
#else
|
||||
Options...
|
||||
#endif
|
||||
>::type
|
||||
{
|
||||
#ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
|
||||
#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
|
||||
//! <b>Effects</b>: If link_mode is \c auto_unlink or \c safe_link
|
||||
//! initializes the node to an unlinked state.
|
||||
//!
|
||||
@@ -279,7 +291,7 @@ class unordered_set_base_hook
|
||||
|
||||
//! Helper metafunction to define a \c unordered_set_member_hook that yields to the same
|
||||
//! type when the same options (either explicitly or implicitly) are used.
|
||||
#ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
|
||||
#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) || defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
|
||||
template<class ...Options>
|
||||
#else
|
||||
template<class O1 = none, class O2 = none, class O3 = none, class O4 = none>
|
||||
@@ -288,7 +300,13 @@ struct make_unordered_set_member_hook
|
||||
{
|
||||
/// @cond
|
||||
typedef typename pack_options
|
||||
< hook_defaults, O1, O2, O3, O4>::type packed_options;
|
||||
< hook_defaults,
|
||||
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
|
||||
O1, O2, O3, O4
|
||||
#else
|
||||
Options...
|
||||
#endif
|
||||
>::type packed_options;
|
||||
|
||||
typedef detail::generic_hook
|
||||
< get_uset_node_algo< typename packed_options::void_pointer
|
||||
@@ -318,15 +336,21 @@ struct make_unordered_set_member_hook
|
||||
//!
|
||||
//! \c store_hash<> will tell the hook to store the hash of the value
|
||||
//! to speed up rehashings.
|
||||
#ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
|
||||
#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) || defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
|
||||
template<class ...Options>
|
||||
#else
|
||||
template<class O1, class O2, class O3, class O4>
|
||||
#endif
|
||||
class unordered_set_member_hook
|
||||
: public make_unordered_set_member_hook<O1, O2, O3, O4>::type
|
||||
: public make_unordered_set_member_hook<
|
||||
#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
|
||||
O1, O2, O3, O4
|
||||
#else
|
||||
Options...
|
||||
#endif
|
||||
>::type
|
||||
{
|
||||
#ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
|
||||
#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
|
||||
//! <b>Effects</b>: If link_mode is \c auto_unlink or \c safe_link
|
||||
//! initializes the node to an unlinked state.
|
||||
//!
|
||||
|
||||
Reference in new issue
Block a user