From ad5cedc08c83e8cbcc8aaeac9634d44624ffe35a Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Tue, 19 Feb 2019 14:43:45 +0100 Subject: [PATCH] cleanup --- src/entt/entity/entity.hpp | 2 -- src/entt/entity/group.hpp | 20 ------------------- src/entt/entity/sparse_set.hpp | 18 ----------------- src/entt/entity/view.hpp | 36 ---------------------------------- src/entt/meta/meta.hpp | 12 ------------ src/entt/resource/handle.hpp | 12 ------------ src/entt/signal/emitter.hpp | 17 ---------------- 7 files changed, 117 deletions(-) diff --git a/src/entt/entity/entity.hpp b/src/entt/entity/entity.hpp index cf103cc89..2da22a68b 100644 --- a/src/entt/entity/entity.hpp +++ b/src/entt/entity/entity.hpp @@ -19,8 +19,6 @@ namespace internal { struct null { - explicit constexpr null() = default; - template constexpr operator Entity() const ENTT_NOEXCEPT { using traits_type = entt_traits; diff --git a/src/entt/entity/group.hpp b/src/entt/entity/group.hpp index 715ddd26b..804f414fc 100644 --- a/src/entt/entity/group.hpp +++ b/src/entt/entity/group.hpp @@ -109,16 +109,6 @@ public: /*! @brief Input iterator type. */ using iterator_type = typename sparse_set::iterator_type; - /*! @brief Default copy constructor. */ - group(const group &) = default; - /*! @brief Default move constructor. */ - group(group &&) = default; - - /*! @brief Default copy assignment operator. @return This group. */ - group & operator=(const group &) = default; - /*! @brief Default move assignment operator. @return This group. */ - group & operator=(group &&) = default; - /** * @brief Returns the number of entities that have the given components. * @return Number of entities that have the given components. @@ -374,16 +364,6 @@ public: /*! @brief Input iterator type. */ using iterator_type = typename sparse_set::iterator_type; - /*! @brief Default copy constructor. */ - group(const group &) = default; - /*! @brief Default move constructor. */ - group(group &&) = default; - - /*! @brief Default copy assignment operator. @return This group. */ - group & operator=(const group &) = default; - /*! @brief Default move assignment operator. @return This group. */ - group & operator=(group &&) = default; - /** * @brief Returns the number of entities that have the given components. * @return Number of entities that have the given components. diff --git a/src/entt/entity/sparse_set.hpp b/src/entt/entity/sparse_set.hpp index 587de5b7a..db67f26cf 100644 --- a/src/entt/entity/sparse_set.hpp +++ b/src/entt/entity/sparse_set.hpp @@ -80,12 +80,6 @@ class sparse_set { iterator() ENTT_NOEXCEPT = default; - iterator(const iterator &) ENTT_NOEXCEPT = default; - iterator(iterator &&) ENTT_NOEXCEPT = default; - - iterator & operator=(const iterator &) ENTT_NOEXCEPT = default; - iterator & operator=(iterator &&) ENTT_NOEXCEPT = default; - iterator & operator++() ENTT_NOEXCEPT { return --index, *this; } @@ -533,12 +527,6 @@ class sparse_set: public sparse_set { iterator() ENTT_NOEXCEPT = default; - iterator(const iterator &) ENTT_NOEXCEPT = default; - iterator(iterator &&) ENTT_NOEXCEPT = default; - - iterator & operator=(const iterator &) ENTT_NOEXCEPT = default; - iterator & operator=(iterator &&) ENTT_NOEXCEPT = default; - iterator & operator++() ENTT_NOEXCEPT { return --index, *this; } @@ -641,12 +629,6 @@ class sparse_set: public sparse_set { iterator() ENTT_NOEXCEPT = default; - iterator(const iterator &) ENTT_NOEXCEPT = default; - iterator(iterator &&) ENTT_NOEXCEPT = default; - - iterator & operator=(const iterator &) ENTT_NOEXCEPT = default; - iterator & operator=(iterator &&) ENTT_NOEXCEPT = default; - iterator & operator++() ENTT_NOEXCEPT { return --index, *this; } diff --git a/src/entt/entity/view.hpp b/src/entt/entity/view.hpp index 7be464ad8..daf525ad3 100644 --- a/src/entt/entity/view.hpp +++ b/src/entt/entity/view.hpp @@ -118,9 +118,6 @@ class view { iterator() ENTT_NOEXCEPT = default; - iterator(const iterator &) ENTT_NOEXCEPT = default; - iterator & operator=(const iterator &) ENTT_NOEXCEPT = default; - iterator & operator++() ENTT_NOEXCEPT { return (++begin != end && !valid()) ? ++(*this) : *this; } @@ -225,16 +222,6 @@ public: /*! @brief Input iterator type. */ using iterator_type = iterator; - /*! @brief Default copy constructor. */ - view(const view &) = default; - /*! @brief Default move constructor. */ - view(view &&) = default; - - /*! @brief Default copy assignment operator. @return This view. */ - view & operator=(const view &) = default; - /*! @brief Default move assignment operator. @return This view. */ - view & operator=(view &&) = default; - /** * @brief Estimates the number of entities that have the given components. * @return Estimated number of entities that have the given components. @@ -424,16 +411,6 @@ public: /*! @brief Input iterator type. */ using iterator_type = typename sparse_set::iterator_type; - /*! @brief Default copy constructor. */ - view(const view &) = default; - /*! @brief Default move constructor. */ - view(view &&) = default; - - /*! @brief Default copy assignment operator. @return This view. */ - view & operator=(const view &) = default; - /*! @brief Default move assignment operator. @return This view. */ - view & operator=(view &&) = default; - /** * @brief Returns the number of entities that have the given component. * @return Number of entities that have the given component. @@ -685,9 +662,6 @@ class runtime_view { iterator() ENTT_NOEXCEPT = default; - iterator(const iterator &) ENTT_NOEXCEPT = default; - iterator & operator=(const iterator &) ENTT_NOEXCEPT = default; - iterator & operator++() ENTT_NOEXCEPT { return (++begin != end && !valid()) ? ++(*this) : *this; } @@ -758,16 +732,6 @@ public: /*! @brief Input iterator type. */ using iterator_type = iterator; - /*! @brief Default copy constructor. */ - runtime_view(const runtime_view &) = default; - /*! @brief Default move constructor. */ - runtime_view(runtime_view &&) = default; - - /*! @brief Default copy assignment operator. @return This view. */ - runtime_view & operator=(const runtime_view &) = default; - /*! @brief Default move assignment operator. @return This view. */ - runtime_view & operator=(runtime_view &&) = default; - /** * @brief Estimates the number of entities that have the given components. * @return Estimated number of entities that have the given components. diff --git a/src/entt/meta/meta.hpp b/src/entt/meta/meta.hpp index 543248cd8..1866f8f02 100644 --- a/src/entt/meta/meta.hpp +++ b/src/entt/meta/meta.hpp @@ -658,18 +658,6 @@ public: /*! @brief Default destructor. */ ~meta_handle() ENTT_NOEXCEPT = default; - /*! @brief Default copy constructor. */ - meta_handle(const meta_handle &) ENTT_NOEXCEPT = default; - - /*! @brief Default move constructor. */ - meta_handle(meta_handle &&) ENTT_NOEXCEPT = default; - - /*! @brief Default copy assignment operator. @return This handle. */ - meta_handle & operator=(const meta_handle &) ENTT_NOEXCEPT = default; - - /*! @brief Default move assignment operator. @return This handle. */ - meta_handle & operator=(meta_handle &&) ENTT_NOEXCEPT = default; - /** * @brief Returns the meta type of the underlying object. * @return The meta type of the underlying object, if any. diff --git a/src/entt/resource/handle.hpp b/src/entt/resource/handle.hpp index af190235f..a0e040935 100644 --- a/src/entt/resource/handle.hpp +++ b/src/entt/resource/handle.hpp @@ -37,18 +37,6 @@ class resource_handle { {} public: - /*! @brief Default constructor. */ - resource_handle() ENTT_NOEXCEPT = default; - /*! @brief Default copy constructor. */ - resource_handle(const resource_handle &) ENTT_NOEXCEPT = default; - /*! @brief Default move constructor. */ - resource_handle(resource_handle &&) ENTT_NOEXCEPT = default; - - /*! @brief Default copy assignment operator. @return This handle. */ - resource_handle & operator=(const resource_handle &) ENTT_NOEXCEPT = default; - /*! @brief Default move assignment operator. @return This handle. */ - resource_handle & operator=(resource_handle &&) ENTT_NOEXCEPT = default; - /** * @brief Gets a reference to the managed resource. * diff --git a/src/entt/signal/emitter.hpp b/src/entt/signal/emitter.hpp index 7af4452c5..a4869e6a8 100644 --- a/src/entt/signal/emitter.hpp +++ b/src/entt/signal/emitter.hpp @@ -159,23 +159,6 @@ public: connection(typename event_handler::connection_type conn) : event_handler::connection_type{std::move(conn)} {} - - /*! @brief Default copy constructor. */ - connection(const connection &) = default; - /*! @brief Default move constructor. */ - connection(connection &&) = default; - - /** - * @brief Default copy assignment operator. - * @return This connection. - */ - connection & operator=(const connection &) = default; - - /** - * @brief Default move assignment operator. - * @return This connection. - */ - connection & operator=(connection &&) = default; }; /*! @brief Default constructor. */