diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/actor/actor.hpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/include/mbgl/actor/actor.hpp b/include/mbgl/actor/actor.hpp index 00e1bb82f8..74d5a66285 100644 --- a/include/mbgl/actor/actor.hpp +++ b/include/mbgl/actor/actor.hpp @@ -7,6 +7,7 @@ #include <memory> #include <future> +#include <type_traits> namespace mbgl { @@ -47,10 +48,21 @@ namespace mbgl { template <class Object> class Actor : public util::noncopyable { public: - template <class... Args> + + // Enabled for Objects with a constructor taking ActorRef<Object> as the first parameter + template <typename U = Object, class... Args, + typename std::enable_if<std::is_constructible<U, ActorRef<Object>, Args...>::value>::type...> + Actor(Scheduler& scheduler, Args&&... args_) + : mailbox(std::make_shared<Mailbox>(scheduler)), + object(self(), std::forward<Args>(args_)...) { + } + + // Enabled for plain Objects + template <typename U = Object, class... Args, + typename std::enable_if<!std::is_constructible<U, ActorRef<Object>, Args...>::value>::type...> Actor(Scheduler& scheduler, Args&&... args_) - : mailbox(std::make_shared<Mailbox>(scheduler)), - object(self(), std::forward<Args>(args_)...) { + : mailbox(std::make_shared<Mailbox>(scheduler)), + object(std::forward<Args>(args_)...) { } ~Actor() { |