瀏覽代碼

now it works with MSVC2017 (#19)

#18
Michele Caini 8 年之前
父節點
當前提交
290dda50fe
共有 3 個文件被更改,包括 6 次插入6 次删除
  1. 4 4
      src/entt/process/scheduler.hpp
  2. 1 1
      src/entt/resource/handle.hpp
  3. 1 1
      src/entt/resource/loader.hpp

+ 4 - 4
src/entt/process/scheduler.hpp

@@ -114,8 +114,8 @@ class Scheduler final {
             using Proc = typename decltype(next)::type;
             using Proc = typename decltype(next)::type;
 
 
             if(handler) {
             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();
                 handler = handler->next.get();
             }
             }
 
 
@@ -197,8 +197,8 @@ public:
     auto attach(Args&&... args) {
     auto attach(Args&&... args) {
         static_assert(std::is_base_of<Process<Proc, Delta>, Proc>::value, "!");
         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));
         handlers.push_back(std::move(handler));
 
 
         return then(&handlers.back());
         return then(&handlers.back());

+ 1 - 1
src/entt/resource/handle.hpp

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

+ 1 - 1
src/entt/resource/loader.hpp

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