From 9feef11d6f41e52d3353a626ac37dc79df73dfa9 Mon Sep 17 00:00:00 2001
From: Michele Caini <michele.caini@gmail.com>
Date: Fri, 8 Jun 2018 22:58:12 +0200
Subject: [PATCH] cleanup + tests

---
 src/entt/entity/sparse_set.hpp | 12 ------------
 src/entt/entity/view.hpp       | 13 -------------
 test/entt/entity/view.cpp      |  8 ++++++++
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/src/entt/entity/sparse_set.hpp b/src/entt/entity/sparse_set.hpp
index eaf888ac3..beb8e3ef7 100644
--- a/src/entt/entity/sparse_set.hpp
+++ b/src/entt/entity/sparse_set.hpp
@@ -81,12 +81,6 @@ class SparseSet<Entity> {
         Iterator(const Iterator &) ENTT_NOEXCEPT = default;
         Iterator & operator=(const Iterator &) ENTT_NOEXCEPT = default;
 
-        friend void swap(Iterator &lhs, Iterator &rhs) ENTT_NOEXCEPT {
-            using std::swap;
-            swap(lhs.direct, rhs.direct);
-            swap(lhs.pos, rhs.pos);
-        }
-
         Iterator & operator++() ENTT_NOEXCEPT {
             return --pos, *this;
         }
@@ -588,12 +582,6 @@ class SparseSet<Entity, Type>: public SparseSet<Entity> {
         Iterator(const Iterator &) ENTT_NOEXCEPT = default;
         Iterator & operator=(const Iterator &) ENTT_NOEXCEPT = default;
 
-        friend void swap(Iterator &lhs, Iterator &rhs) ENTT_NOEXCEPT {
-            using std::swap;
-            swap(lhs.instances, rhs.instances);
-            swap(lhs.pos, rhs.pos);
-        }
-
         Iterator & operator++() ENTT_NOEXCEPT {
             return --pos, *this;
         }
diff --git a/src/entt/entity/view.hpp b/src/entt/entity/view.hpp
index 3754734c6..3941f203e 100644
--- a/src/entt/entity/view.hpp
+++ b/src/entt/entity/view.hpp
@@ -511,14 +511,6 @@ class View final {
         Iterator(const Iterator &) ENTT_NOEXCEPT = default;
         Iterator & operator=(const Iterator &) ENTT_NOEXCEPT = default;
 
-        friend void swap(Iterator &lhs, Iterator &rhs) ENTT_NOEXCEPT {
-            using std::swap;
-            swap(lhs.unchecked, rhs.unchecked);
-            swap(lhs.extent, rhs.extent);
-            swap(lhs.begin, rhs.begin);
-            swap(lhs.end, rhs.end);
-        }
-
         Iterator & operator++() ENTT_NOEXCEPT {
             return (++begin != end && !valid()) ? ++(*this) : *this;
         }
@@ -560,11 +552,6 @@ class View final {
         return std::get<pool_type<Comp> &>(pools);
     }
 
-    template<typename Comp>
-    inline pool_type<Comp> & pool() ENTT_NOEXCEPT {
-        return const_cast<pool_type<Comp> &>(const_cast<const View *>(this)->pool<Comp>());
-    }
-
     const view_type * candidate() const ENTT_NOEXCEPT {
         return std::min({ static_cast<const view_type *>(&pool<Component>())... }, [](const auto *lhs, const auto *rhs) {
             return lhs->size() < rhs->size();
diff --git a/test/entt/entity/view.cpp b/test/entt/entity/view.cpp
index 80f581d77..36d98557b 100644
--- a/test/entt/entity/view.cpp
+++ b/test/entt/entity/view.cpp
@@ -6,6 +6,7 @@
 TEST(SingleComponentView, Functionalities) {
     entt::DefaultRegistry registry;
     auto view = registry.view<char>();
+    const auto &cview = view;
 
     const auto e0 = registry.create();
     const auto e1 = registry.create();
@@ -19,6 +20,7 @@ TEST(SingleComponentView, Functionalities) {
     ASSERT_NO_THROW(++registry.view<char>().begin());
 
     ASSERT_NE(view.begin(), view.end());
+    ASSERT_NE(cview.begin(), cview.end());
     ASSERT_EQ(view.size(), typename decltype(view)::size_type{1});
     ASSERT_FALSE(view.empty());
 
@@ -107,6 +109,7 @@ TEST(SingleComponentView, Each) {
 TEST(MultipleComponentView, Functionalities) {
     entt::DefaultRegistry registry;
     auto view = registry.view<int, char>();
+    const auto &cview = view;
 
     ASSERT_TRUE(view.empty());
 
@@ -130,6 +133,7 @@ TEST(MultipleComponentView, Functionalities) {
     ASSERT_NO_THROW((++registry.view<int, char>().begin()));
 
     ASSERT_NE(view.begin(), view.end());
+    ASSERT_NE(cview.begin(), cview.end());
     ASSERT_EQ(view.size(), decltype(view.size()){1});
 
     registry.get<char>(e0) = '1';
@@ -285,6 +289,7 @@ TEST(PersistentView, Prepare) {
     entt::DefaultRegistry registry;
     registry.prepare<int, char>();
     auto view = registry.view<int, char>(entt::persistent_t{});
+    const auto &cview = view;
 
     ASSERT_TRUE(view.empty());
 
@@ -300,6 +305,7 @@ TEST(PersistentView, Prepare) {
     ASSERT_NO_THROW((++registry.view<int, char>(entt::persistent_t{}).begin()));
 
     ASSERT_NE(view.begin(), view.end());
+    ASSERT_NE(cview.begin(), cview.end());
     ASSERT_EQ(view.size(), typename decltype(view)::size_type{1});
 
     registry.assign<int>(e0);
@@ -485,6 +491,7 @@ TEST(PersistentView, Sort) {
 TEST(RawView, Functionalities) {
     entt::DefaultRegistry registry;
     auto view = registry.view<char>(entt::raw_t{});
+    const auto &cview = view;
 
     ASSERT_TRUE(view.empty());
 
@@ -499,6 +506,7 @@ TEST(RawView, Functionalities) {
     ASSERT_NO_THROW(++registry.view<char>(entt::raw_t{}).begin());
 
     ASSERT_NE(view.begin(), view.end());
+    ASSERT_NE(cview.begin(), cview.end());
     ASSERT_EQ(view.size(), typename decltype(view)::size_type{1});
 
     registry.assign<char>(e0);