From ad262ea624f6371dcc38cd529c5c5b42e1dcdaee Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Sun, 16 Aug 2020 12:10:55 +0200 Subject: [PATCH] entity/*: suppress some warnings here and there --- src/entt/entity/registry.hpp | 2 +- src/entt/entity/sparse_set.hpp | 4 ++-- src/entt/entity/storage.hpp | 2 +- src/entt/entity/view.hpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/entt/entity/registry.hpp b/src/entt/entity/registry.hpp index d34c556db..faf2e6193 100644 --- a/src/entt/entity/registry.hpp +++ b/src/entt/entity/registry.hpp @@ -186,7 +186,7 @@ class basic_registry { const auto index = type_index::value(); if(!(index < pools.size())) { - pools.resize(index+1); + pools.resize(size_type(index+1u)); } if(auto &&pdata = pools[index]; !pdata.pool) { diff --git a/src/entt/entity/sparse_set.hpp b/src/entt/entity/sparse_set.hpp index d11413b78..a51366236 100644 --- a/src/entt/entity/sparse_set.hpp +++ b/src/entt/entity/sparse_set.hpp @@ -107,7 +107,7 @@ class sparse_set { } [[nodiscard]] reference operator[](const difference_type value) const { - const auto pos = size_type(index-value-1); + const auto pos = size_type(index-value-1u); return (*packed)[pos]; } @@ -136,7 +136,7 @@ class sparse_set { } [[nodiscard]] pointer operator->() const { - const auto pos = size_type(index-1); + const auto pos = size_type(index-1u); return &(*packed)[pos]; } diff --git a/src/entt/entity/storage.hpp b/src/entt/entity/storage.hpp index 0da376400..c8f5c5925 100644 --- a/src/entt/entity/storage.hpp +++ b/src/entt/entity/storage.hpp @@ -141,7 +141,7 @@ class storage: public sparse_set { } [[nodiscard]] pointer operator->() const ENTT_NOEXCEPT { - const auto pos = size_type(index-1); + const auto pos = size_type(index-1u); return &(*instances)[pos]; } diff --git a/src/entt/entity/view.hpp b/src/entt/entity/view.hpp index d41760a74..b256beab7 100644 --- a/src/entt/entity/view.hpp +++ b/src/entt/entity/view.hpp @@ -255,7 +255,7 @@ class basic_view, Component...> { [[nodiscard]] unchecked_type unchecked(const sparse_set *view) const { std::size_t pos{}; unchecked_type other{}; - ((std::get *>(pools) == view ? nullptr : (other[pos++] = std::get *>(pools))), ...); + ((std::get *>(pools) == view ? nullptr : (other[pos] = std::get *>(pools), other[pos++])), ...); return other; }