Scarfski/entt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

now it works with MSVC2017 (#19)

Browse Source 
#18
This commit is contained in:
Michele Caini
2017-11-13 10:39:55 +01:00
committed by GitHub
parent a7278573a8
commit 290dda50fe
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/entt/process/scheduler.hpp
View File

@@ -114,8 +114,8 @@ class Scheduler final {
using Proc = typename decltype(next)::type;
if(handler) {
auto proc = typename ProcessHandler::instance_type{ new Proc{std::forward<decltype(args)>(args)...}, &deleter<Proc> };
handler->next.reset(new ProcessHandler{std::move(proc), &this->update<Proc>, &this->abort<Proc>, nullptr});
auto proc = typename ProcessHandler::instance_type{ new Proc{std::forward<decltype(args)>(args)...}, &Scheduler::deleter<Proc> };
handler->next.reset(new ProcessHandler{std::move(proc), &Scheduler::update<Proc>, &Scheduler::abort<Proc>, nullptr});
handler = handler->next.get();
}
@@ -197,8 +197,8 @@ public:
auto attach(Args&&... args) {
static_assert(std::is_base_of<Process<Proc, Delta>, Proc>::value, "!");
auto proc = typename ProcessHandler::instance_type{ new Proc{std::forward<Args>(args)...}, &deleter<Proc> };
ProcessHandler handler{std::move(proc), &update<Proc>, &abort<Proc>, nullptr};
auto proc = typename ProcessHandler::instance_type{ new Proc{std::forward<Args>(args)...}, &Scheduler::deleter<Proc> };
ProcessHandler handler{std::move(proc), &Scheduler::update<Proc>, &Scheduler::abort<Proc>, nullptr};
handlers.push_back(std::move(handler));
return then(&handlers.back());

2
src/entt/resource/handle.hpp
View File

@@ -11,7 +11,7 @@ namespace entt {
template<typename Resource>
struct ResourceCache;
class ResourceCache;
/**

2
src/entt/resource/loader.hpp
View File

@@ -9,7 +9,7 @@ namespace entt {
template<typename Resource>
struct ResourceCache;
class ResourceCache;
/**