Merge 22b8ab2 into 94ede1b

skypjack · Feb 22, 2018 · 79f722d · 79f722d
2 parents 94ede1b + 22b8ab2
commit 79f722d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/entt/entity/sparse_set.hpp b/src/entt/entity/sparse_set.hpp
@@ -614,11 +614,11 @@ class SparseSet<Entity, Type>: public SparseSet<Entity> {
         auto to = other.end();
 
         pos_type pos = underlying_type::size() - 1;
-        const auto *direct = underlying_type::data();
+        const auto *local = underlying_type::data();
 
         while(pos > 0 && from != to) {
             if(underlying_type::has(*from)) {
-                if(*from != *(direct + pos)) {
+                if(*from != *(local + pos)) {
                     auto candidate = underlying_type::get(*from);
                     std::swap(instances[pos], instances[candidate]);
                     underlying_type::swap(pos, candidate);