From b652357a5c8babe16687e0525ca455fdb9d411ca Mon Sep 17 00:00:00 2001
From: Michele Caini <michele.caini@gmail.com>
Date: Mon, 2 Sep 2019 16:48:47 +0200
Subject: [PATCH] review: group::sort

---
 src/entt/entity/group.hpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/entt/entity/group.hpp b/src/entt/entity/group.hpp
index e3d061724..7c79d2f2b 100644
--- a/src/entt/entity/group.hpp
+++ b/src/entt/entity/group.hpp
@@ -839,11 +839,9 @@ public:
         }
 
         for(auto next = *length; next; --next) {
-            ([next = next-1, curr = cpool->data()[next-1]](auto *cpool) {
-                if(const auto pos = cpool->index(curr); pos != next) {
-                    cpool->swap(next, pos);
-                }
-            }(std::get<pool_type<Other> *>(pools)), ...);
+            const auto pos = next - 1;
+            const auto entt = cpool->data()[pos];
+            (std::get<pool_type<Other> *>(pools)->swap(pos, std::get<pool_type<Other> *>(pools)->index(entt)), ...);
         }
     }