diff --git a/src/entt/entity/storage.hpp b/src/entt/entity/storage.hpp index 9b0e5dd83..608ce793f 100644 --- a/src/entt/entity/storage.hpp +++ b/src/entt/entity/storage.hpp @@ -304,11 +304,11 @@ private: } void swap_or_move([[maybe_unused]] const std::size_t from, [[maybe_unused]] const std::size_t to) override { - static constexpr bool is_pinned_type_v = !(std::is_move_constructible_v && std::is_move_assignable_v); + static constexpr bool is_pinned_type = !(std::is_move_constructible_v && std::is_move_assignable_v); // use a runtime value to avoid compile-time suppression that drives the code coverage tool crazy - ENTT_ASSERT((from + 1u) && !is_pinned_type_v, "Pinned type"); + ENTT_ASSERT((from + 1u) && !is_pinned_type, "Pinned type"); - if constexpr(!is_pinned_type_v) { + if constexpr(!is_pinned_type) { auto &elem = element_at(from); if constexpr(traits_type::in_place_delete) { diff --git a/src/entt/poly/poly.hpp b/src/entt/poly/poly.hpp index c8a5b5f98..dcc188b60 100644 --- a/src/entt/poly/poly.hpp +++ b/src/entt/poly/poly.hpp @@ -97,11 +97,11 @@ class poly_vtable { } using vtable_type = decltype(make_vtable(Concept{})); - static constexpr bool is_mono_v = std::tuple_size_v == 1u; + static constexpr bool is_mono = std::tuple_size_v == 1u; public: /*! @brief Virtual table type. */ - using type = std::conditional_t, const vtable_type *>; + using type = std::conditional_t, const vtable_type *>; /** * @brief Returns a static virtual table for a specific concept and type. @@ -113,7 +113,7 @@ public: static_assert(std::is_same_v>, "Type differs from its decayed form"); static const vtable_type vtable = fill_vtable(std::make_index_sequence::size>{}); - if constexpr(is_mono_v) { + if constexpr(is_mono) { return std::get<0>(vtable); } else { return &vtable; diff --git a/src/entt/resource/resource.hpp b/src/entt/resource/resource.hpp index 0b0ee3817..51325dc8e 100644 --- a/src/entt/resource/resource.hpp +++ b/src/entt/resource/resource.hpp @@ -24,7 +24,7 @@ class resource { friend class resource; template - static constexpr bool is_acceptable_v = !std::is_same_v && std::is_constructible_v; + static constexpr bool is_acceptable = !std::is_same_v && std::is_constructible_v; public: /*! @brief Resource type. */ @@ -64,7 +64,7 @@ public: * @tparam Other Type of resource managed by the received handle. * @param other The handle to copy from. */ - template>> + template>> resource(const resource &other) noexcept : value{other.value} {} @@ -73,7 +73,7 @@ public: * @tparam Other Type of resource managed by the received handle. * @param other The handle to move from. */ - template>> + template>> resource(resource &&other) noexcept : value{std::move(other.value)} {} @@ -98,7 +98,7 @@ public: * @param other The handle to copy from. * @return This resource handle. */ - template>> + template>> resource &operator=(const resource &other) noexcept { value = other.value; return *this; @@ -110,7 +110,7 @@ public: * @param other The handle to move from. * @return This resource handle. */ - template>> + template>> resource &operator=(resource &&other) noexcept { value = std::move(other.value); return *this;