From 37e1ac71b0067e34eb7d4d5b166ef7b379f46453 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Wed, 4 Sep 2019 17:42:27 +0200 Subject: [PATCH] minor changes --- src/entt/entity/observer.hpp | 2 +- src/entt/entity/runtime_view.hpp | 4 ++-- src/entt/entity/storage.hpp | 8 ++++---- src/entt/entity/view.hpp | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/entt/entity/observer.hpp b/src/entt/entity/observer.hpp index 410464bd8..404b38691 100644 --- a/src/entt/entity/observer.hpp +++ b/src/entt/entity/observer.hpp @@ -258,7 +258,7 @@ public: /*! @brief Underlying entity identifier. */ using entity_type = Entity; /*! @brief Unsigned integer type. */ - using size_type = typename sparse_set::size_type; + using size_type = std::size_t; /*! @brief Input iterator type. */ using iterator_type = typename sparse_set::iterator_type; diff --git a/src/entt/entity/runtime_view.hpp b/src/entt/entity/runtime_view.hpp index 33680d4ea..30fd39d69 100644 --- a/src/entt/entity/runtime_view.hpp +++ b/src/entt/entity/runtime_view.hpp @@ -141,9 +141,9 @@ class basic_runtime_view { public: /*! @brief Underlying entity identifier. */ - using entity_type = typename sparse_set::entity_type; + using entity_type = Entity; /*! @brief Unsigned integer type. */ - using size_type = typename sparse_set::size_type; + using size_type = std::size_t; /*! @brief Input iterator type. */ using iterator_type = iterator; diff --git a/src/entt/entity/storage.hpp b/src/entt/entity/storage.hpp index 2c192b661..58e2a7164 100644 --- a/src/entt/entity/storage.hpp +++ b/src/entt/entity/storage.hpp @@ -158,9 +158,9 @@ public: /*! @brief Type of the objects associated with the entities. */ using object_type = Type; /*! @brief Underlying entity identifier. */ - using entity_type = typename underlying_type::entity_type; + using entity_type = Entity; /*! @brief Unsigned integer type. */ - using size_type = typename underlying_type::size_type; + using size_type = std::size_t; /*! @brief Random access iterator type. */ using iterator_type = iterator; /*! @brief Constant random access iterator type. */ @@ -597,9 +597,9 @@ public: /*! @brief Type of the objects associated with the entities. */ using object_type = Type; /*! @brief Underlying entity identifier. */ - using entity_type = typename underlying_type::entity_type; + using entity_type = Entity; /*! @brief Unsigned integer type. */ - using size_type = typename underlying_type::size_type; + using size_type = std::size_t; /*! @brief Random access iterator type. */ using iterator_type = iterator; diff --git a/src/entt/entity/view.hpp b/src/entt/entity/view.hpp index 8a4a6a696..7fe9e5d8d 100644 --- a/src/entt/entity/view.hpp +++ b/src/entt/entity/view.hpp @@ -191,9 +191,9 @@ class basic_view { public: /*! @brief Underlying entity identifier. */ - using entity_type = typename sparse_set::entity_type; + using entity_type = Entity; /*! @brief Unsigned integer type. */ - using size_type = typename sparse_set::size_type; + using size_type = std::size_t; /*! @brief Input iterator type. */ using iterator_type = iterator; @@ -539,9 +539,9 @@ public: /*! @brief Type of component iterated by the view. */ using raw_type = Component; /*! @brief Underlying entity identifier. */ - using entity_type = typename pool_type::entity_type; + using entity_type = Entity; /*! @brief Unsigned integer type. */ - using size_type = typename pool_type::size_type; + using size_type = std::size_t; /*! @brief Input iterator type. */ using iterator_type = typename sparse_set::iterator_type;