tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] make actor self reference optional - again

Browse Source 
- uses a different method of constructor selection that also works on Apple clang < 8.2.
This commit is contained in:
Ivo van Dongen
2017-08-08 10:42:44 +03:00
committed by Ivo van Dongen
parent 2dd8ec8854
commit 68f470fdda
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/mbgl/actor/actor.hpp
View File

@@ -50,13 +50,18 @@ class Actor : public util::noncopyable {
public:
// 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...>
template <typename U = Object, class... Args, typename std::enable_if<std::is_constructible<U, ActorRef<U>, Args...>::value>::type * = nullptr>
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<U>, Args...>::value>::type * = nullptr>
Actor(Scheduler& scheduler, Args&& ... args_)
: mailbox(std::make_shared<Mailbox>(scheduler)), object(std::forward<Args>(args_)...) {
}
~Actor() {
mailbox->close();
}