From 77ea28bef222a32df251d0d7c4c982ddf2c479ff Mon Sep 17 00:00:00 2001
From: Michele Caini <michele.caini@gmail.com>
Date: Mon, 29 Apr 2019 23:19:09 +0200
Subject: [PATCH] slightly improved registry::replace (thanks to ColinH for
 pointing it out)

---
 AUTHORS                      | 1 +
 src/entt/entity/registry.hpp | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index ef39ca464..ff7c2a3d5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,6 +7,7 @@ skypjack
 BenediktConze
 bjadamson
 ceeac
+ColinH
 corystegel
 Croydon
 dbacchet
diff --git a/src/entt/entity/registry.hpp b/src/entt/entity/registry.hpp
index 77a92bef4..ca5eea3e4 100644
--- a/src/entt/entity/registry.hpp
+++ b/src/entt/entity/registry.hpp
@@ -98,9 +98,7 @@ class basic_registry {
         Component & replace(const Entity entt, Args &&... args) {
             Component component{std::forward<Args>(args)...};
             on_replace.publish(*owner, entt, component);
-            auto &other = sparse_set<Entity, Component>::get(entt);
-            std::swap(other, component);
-            return other;
+            return (sparse_set<Entity, Component>::get(entt) = std::move(component));
         }
     };