import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / msm / back / state_machine.hpp

diff --git a/ceph/src/boost/boost/msm/back/state_machine.hpp b/ceph/src/boost/boost/msm/back/state_machine.hpp
index 235250b95fb783da716cb5df65376d8288fab5e6..be867df8d804b2f49eae4ba1b389a333aafa9f53 100644 (file)
--- a/ceph/src/boost/boost/msm/back/state_machine.hpp
+++ b/ceph/src/boost/boost/msm/back/state_machine.hpp
@@ -17,7 +17,7 @@
 #include <numeric>
 #include <utility>
 
-#include <boost/detail/no_exceptions_support.hpp>
+#include <boost/core/no_exceptions_support.hpp>
 
 #include <boost/mpl/contains.hpp>
 #include <boost/mpl/deref.hpp>
@@ -41,7 +41,7 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_convertible.hpp>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/function.hpp>
 #ifndef BOOST_NO_RTTI
 #include <boost/any.hpp>
@@ -2302,7 +2302,7 @@ private:
         template <class StateType,int ARGS>
         struct visitor_args;
 
-#define MSM_VISITOR_ARGS_SUB(z, n, unused) BOOST_PP_CAT(_,BOOST_PP_ADD(n,1))
+#define MSM_VISITOR_ARGS_SUB(z, n, unused) BOOST_PP_CAT(::boost::placeholders::_,BOOST_PP_ADD(n,1))
 #define MSM_VISITOR_ARGS_TYPEDEF_SUB(z, n, unused) typename StateType::accept_sig::argument ## n
 
 #define MSM_VISITOR_ARGS_EXECUTE(z, n, unused)                                              \
@@ -2384,7 +2384,7 @@ BOOST_PP_REPEAT(BOOST_PP_ADD(BOOST_MSM_VISITOR_ARG_SIZE,1), MSM_VISITOR_ARGS_EXE
             execute_return (ContainingSM::*pf) (typename StateType::event const& evt)=
                 &ContainingSM::process_event;
             ::boost::function<execute_return (typename StateType::event const&)> fct =
-                ::boost::bind(pf,containing_sm,_1);
+                ::boost::bind(pf,containing_sm,::boost::placeholders::_1);
             ::boost::fusion::at_key<StateType>(self->m_substate_list).set_forward_fct(fct);
         }
         // for every defined state in the sm