Browse Source

registry: minor changes

Michele Caini 5 years ago
parent
commit
612554f6af
1 changed files with 18 additions and 18 deletions
  1. 18 18
      src/entt/entity/registry.hpp

+ 18 - 18
src/entt/entity/registry.hpp

@@ -156,6 +156,24 @@ public:
     /*! @brief Poly storage type. */
     using poly_storage = typename poly_storage_traits<Entity>::storage_type;
 
+    /**
+     * @brief Returns the entity identifier without the version.
+     * @param entity An entity identifier, either valid or not.
+     * @return The entity identifier without the version.
+     */
+    [[nodiscard]] static entity_type entity(const entity_type entity) ENTT_NOEXCEPT {
+        return entity_type{to_integral(entity) & traits_type::entity_mask};
+    }
+
+    /**
+     * @brief Returns the version stored along with an entity identifier.
+     * @param entity An entity identifier, either valid or not.
+     * @return The version stored along with the given entity identifier.
+     */
+    [[nodiscard]] static version_type version(const entity_type entity) ENTT_NOEXCEPT {
+        return version_type(to_integral(entity) >> traits_type::entity_shift);
+    }
+
     /*! @brief Default constructor. */
     basic_registry() = default;
 
@@ -343,24 +361,6 @@ public:
         return (pos < entities.size() && entities[pos] == entity);
     }
 
-    /**
-     * @brief Returns the entity identifier without the version.
-     * @param entity An entity identifier, either valid or not.
-     * @return The entity identifier without the version.
-     */
-    [[nodiscard]] static entity_type entity(const entity_type entity) ENTT_NOEXCEPT {
-        return entity_type{to_integral(entity) & traits_type::entity_mask};
-    }
-
-    /**
-     * @brief Returns the version stored along with an entity identifier.
-     * @param entity An entity identifier, either valid or not.
-     * @return The version stored along with the given entity identifier.
-     */
-    [[nodiscard]] static version_type version(const entity_type entity) ENTT_NOEXCEPT {
-        return version_type(to_integral(entity) >> traits_type::entity_shift);
-    }
-
     /**
      * @brief Returns the actual version for an entity identifier.
      *