@@ -100,6 +100,8 @@ struct message_container;
100100*/
101101template <typename T>
102102struct message_container <T,true > : private T {
103+ static constexpr bool is_value_movable =false ;
104+
103105constexpr message_container (T&& t)
104106 : T(std::move(t)) {
105107 }
@@ -120,6 +122,8 @@ struct message_container<T, true> : private T {
120122*/
121123template <typename T>
122124struct message_container <T,false > {
125+ static constexpr bool is_value_movable = std::is_move_constructible<T>::value;
126+
123127constexpr message_container (T&& t)
124128 : value_(std::move(t)) {
125129 }
@@ -129,12 +133,16 @@ struct message_container<T, false> {
129133 : value_(std::forward<Args>(args)...) {
130134 }
131135
132- constexpr const T&data ()const {
136+ constexpr const T&data ()const & {
133137return value_;
134138 }
135139
140+ constexpr Tdata () && {
141+ return std::move (value_);
142+ }
143+
136144private:
137- const
145+ T value_;
138146};
139147
140148template <typename T>
@@ -283,9 +291,9 @@ class actor {
283291 };
284292
285293/* * Wrapper for member function pointers.*/
286- template <typename M,typename C>
294+ template <typename M,typename C, typename P >
287295class mem_handler_t :public handler_t {
288- using F = std::function<void (C*, actor_ref,const M& )>;
296+ using F = std::function<void (C*, actor_ref,P )>;
289297
290298public:
291299mem_handler_t (F&& func, C* ptr)
@@ -294,8 +302,12 @@ class actor {
294302 }
295303
296304void invoke (std::unique_ptr<core::msg_t > msg)const override {
305+ using message_reference_t =
306+ typename std::conditional<core::msg_wrap_t <M>::is_value_movable,
307+ core::msg_wrap_t <M>&&,const core::msg_wrap_t <M>&>::type;
308+
297309func_ (ptr_,actor_ref (msg->sender ,true ),
298- static_cast <core:: msg_wrap_t <M>*>( msg.get ())-> data ());
310+ static_cast <message_reference_t >(* msg.get ()). data ());
299311 }
300312
301313private:
@@ -341,13 +353,13 @@ class actor {
341353void die ();
342354
343355// / Sets handler as member function pointer.
344- template <typename M,typename ClassName>
345- inline void handler (void (ClassName::*func)(actor_ref,const M& )) {
356+ template <typename M,typename ClassName, typename P >
357+ inline void handler (void (ClassName::*func)(actor_ref,P )) {
346358set_handler (
347359// Type of the handler.
348360std::type_index (typeid (M)),
349361// Callback.
350- std::make_unique<mem_handler_t <M, ClassName>>(
362+ std::make_unique<mem_handler_t <M, ClassName, P >>(
351363 func,static_cast <ClassName*>(this )));
352364 }
353365