Michele Caini 6 лет назад
Родитель
Сommit
49f69facaf
3 измененных файлов с 5 добавлено и 5 удалено
  1. 2 2
      src/entt/entity/group.hpp
  2. 2 2
      src/entt/entity/registry.hpp
  3. 1 1
      src/entt/entity/view.hpp

+ 2 - 2
src/entt/entity/group.hpp

@@ -291,7 +291,7 @@ public:
         if constexpr(sizeof...(Component) == 1) {
             return (std::get<pool_type<Component> *>(pools)->get(entt), ...);
         } else {
-            return std::tuple<decltype(get<Component>(entt))...>{get<Component>(entt)...};
+            return std::tuple<decltype(get<Component>({}))...>{get<Component>(entt)...};
         }
     }
 
@@ -712,7 +712,7 @@ public:
         if constexpr(sizeof...(Component) == 1) {
             return (std::get<pool_type<Component> *>(pools)->get(entt), ...);
         } else {
-            return std::tuple<decltype(get<Component>(entt))...>{get<Component>(entt)...};
+            return std::tuple<decltype(get<Component>({}))...>{get<Component>(entt)...};
         }
     }
 

+ 2 - 2
src/entt/entity/registry.hpp

@@ -803,7 +803,7 @@ public:
         if constexpr(sizeof...(Component) == 1) {
             return (pool<Component>()->get(entity), ...);
         } else {
-            return std::tuple<decltype(get<Component>(entity))...>{get<Component>(entity)...};
+            return std::tuple<decltype(get<Component>({}))...>{get<Component>(entity)...};
         }
     }
 
@@ -815,7 +815,7 @@ public:
         if constexpr(sizeof...(Component) == 1) {
             return (pool<Component>()->get(entity), ...);
         } else {
-            return std::tuple<decltype(get<Component>(entity))...>{get<Component>(entity)...};
+            return std::tuple<decltype(get<Component>({}))...>{get<Component>(entity)...};
         }
     }
 

+ 1 - 1
src/entt/entity/view.hpp

@@ -358,7 +358,7 @@ public:
         if constexpr(sizeof...(Comp) == 1) {
             return (std::get<pool_type<Comp> *>(pools)->get(entt), ...);
         } else {
-            return std::tuple<decltype(get<Comp>(entt))...>{get<Comp>(entt)...};
+            return std::tuple<decltype(get<Comp>({}))...>{get<Comp>(entt)...};
         }
     }