Commit 706d9c52 authored by Dominik Charousset's avatar Dominik Charousset

Integrate review feedback (clean up includes)

parent f31ecef9
...@@ -19,17 +19,10 @@ ...@@ -19,17 +19,10 @@
#pragma once #pragma once
#include <type_traits> #include <type_traits>
#include <utility>
#include "caf/actor_traits.hpp"
#include "caf/behavior_policy.hpp" #include "caf/behavior_policy.hpp"
#include "caf/fwd.hpp" #include "caf/fwd.hpp"
#include "caf/local_actor.hpp"
#include "caf/message_id.hpp"
#include "caf/response_handle.hpp"
#include "caf/typed_behavior.hpp"
#include "caf/mixin/sender.hpp"
#include "caf/mixin/requester.hpp"
namespace caf { namespace caf {
namespace mixin { namespace mixin {
...@@ -64,19 +57,16 @@ public: ...@@ -64,19 +57,16 @@ public:
template <class T0, class T1, class... Ts> template <class T0, class T1, class... Ts>
typename std::enable_if< typename std::enable_if<
!std::is_same<keep_behavior_t, typename std::decay<T0>::type>::value !std::is_same<keep_behavior_t, typename std::decay<T0>::type>::value>::type
>::type
become(T0&& x0, T1&& x1, Ts&&... xs) { become(T0&& x0, T1&& x1, Ts&&... xs) {
behavior_type bhvr{std::forward<T0>(x0), behavior_type bhvr{std::forward<T0>(x0), std::forward<T1>(x1),
std::forward<T1>(x1),
std::forward<Ts>(xs)...}; std::forward<Ts>(xs)...};
dptr()->do_become(std::move(bhvr.unbox()), true); dptr()->do_become(std::move(bhvr.unbox()), true);
} }
template <class T0, class T1, class... Ts> template <class T0, class T1, class... Ts>
void become(const keep_behavior_t&, T0&& x0, T1&& x1, Ts&&... xs) { void become(const keep_behavior_t&, T0&& x0, T1&& x1, Ts&&... xs) {
behavior_type bhvr{std::forward<T0>(x0), behavior_type bhvr{std::forward<T0>(x0), std::forward<T1>(x1),
std::forward<T1>(x1),
std::forward<Ts>(xs)...}; std::forward<Ts>(xs)...};
dptr()->do_become(std::move(bhvr.unbox()), false); dptr()->do_become(std::move(bhvr.unbox()), false);
} }
...@@ -93,4 +83,3 @@ private: ...@@ -93,4 +83,3 @@ private:
} // namespace mixin } // namespace mixin
} // namespace caf } // namespace caf
...@@ -21,9 +21,7 @@ ...@@ -21,9 +21,7 @@
#include "caf/actor_cast.hpp" #include "caf/actor_cast.hpp"
#include "caf/actor_storage.hpp" #include "caf/actor_storage.hpp"
#include "caf/actor_system.hpp" #include "caf/actor_system.hpp"
#include "caf/actor_traits.hpp"
#include "caf/blocking_actor.hpp" #include "caf/blocking_actor.hpp"
#include "caf/intrusive_ptr.hpp"
#include "caf/none.hpp" #include "caf/none.hpp"
#include "caf/scoped_execution_unit.hpp" #include "caf/scoped_execution_unit.hpp"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment