From cc699e956fec5955102d4510bdba9799ac1bd35d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= <igaztanaga@gmail.com>
Date: Fri, 10 Oct 2014 18:23:19 +0200
Subject: [PATCH] Updated due to Intrusive detail changes.

---
 include/boost/container/allocator_traits.hpp   | 10 +++++-----
 include/boost/container/detail/memory_util.hpp |  8 ++++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/include/boost/container/allocator_traits.hpp b/include/boost/container/allocator_traits.hpp
index d577df1..a85831f 100644
--- a/include/boost/container/allocator_traits.hpp
+++ b/include/boost/container/allocator_traits.hpp
@@ -174,14 +174,14 @@ struct allocator_traits
 
       #if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
          //C++11
-         template <typename T> using rebind_alloc  = typename boost::intrusive::detail::type_rebinder<Alloc, T>::type;
+         template <typename T> using rebind_alloc  = typename boost::intrusive::pointer_rebind<Alloc, T>::type;
          template <typename T> using rebind_traits = allocator_traits< rebind_alloc<T> >;
       #else    // #if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
          //Some workaround for C++03 or C++11 compilers with no template aliases
          template <typename T>
-         struct rebind_alloc : boost::intrusive::detail::type_rebinder<Alloc,T>::type
+         struct rebind_alloc : boost::intrusive::pointer_rebind<Alloc,T>::type
          {
-            typedef typename boost::intrusive::detail::type_rebinder<Alloc,T>::type Base;
+            typedef typename boost::intrusive::pointer_rebind<Alloc,T>::type Base;
             #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
             template <typename... Args>
             rebind_alloc(BOOST_FWD_REF(Args)... args)
@@ -201,12 +201,12 @@ struct allocator_traits
 
          template <typename T>
          struct rebind_traits
-            : allocator_traits<typename boost::intrusive::detail::type_rebinder<Alloc, T>::type>
+            : allocator_traits<typename boost::intrusive::pointer_rebind<Alloc, T>::type>
          {};
       #endif   // #if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
       template <class T>
       struct portable_rebind_alloc
-      {  typedef typename boost::intrusive::detail::type_rebinder<Alloc, T>::type type;  };
+      {  typedef typename boost::intrusive::pointer_rebind<Alloc, T>::type type;  };
    #endif   //BOOST_CONTAINER_DOXYGEN_INVOKED
 
    //! <b>Returns</b>: <code>a.allocate(n)</code>
diff --git a/include/boost/container/detail/memory_util.hpp b/include/boost/container/detail/memory_util.hpp
index 572d30a..7f055cb 100644
--- a/include/boost/container/detail/memory_util.hpp
+++ b/include/boost/container/detail/memory_util.hpp
@@ -19,7 +19,7 @@
 #include <boost/container/detail/workaround.hpp>
 
 #include <boost/container/detail/preprocessor.hpp>
-#include <boost/intrusive/detail/memory_util.hpp>
+#include <boost/intrusive/detail/mpl.hpp>
 #include <boost/intrusive/detail/has_member_function_callable_with.hpp>
 
 
@@ -50,7 +50,11 @@
 #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_FUNCNAME construct
 #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEGIN namespace boost { namespace container { namespace container_detail {
 #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_END   }}}
-#define BOOST_PP_ITERATION_PARAMS_1 (3, (1, BOOST_CONTAINER_MAX_CONSTRUCTOR_PARAMETERS+1, <boost/intrusive/detail/has_member_function_callable_with.hpp>))
+#ifdef BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_SINGLE_ITERATION
+#  define BOOST_PP_ITERATION_PARAMS_1 (3, (1, 1, <boost/intrusive/detail/has_member_function_callable_with.hpp>))
+#else
+#  define BOOST_PP_ITERATION_PARAMS_1 (3, (1, BOOST_CONTAINER_MAX_CONSTRUCTOR_PARAMETERS+1, <boost/intrusive/detail/has_member_function_callable_with.hpp>))
+#endif
 #include BOOST_PP_ITERATE()
 
 #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_FUNCNAME swap