stl: std::allocator

src/entt/container/fwd.hpp

@@ -13,14 +13,14 @@ template<
     typename Type,
     typename = std::hash<Key>,
     typename = stl::equal_to<>,
-    typename = std::allocator<stl::pair<const Key, Type>>>
+    typename = stl::allocator<stl::pair<const Key, Type>>>
 class dense_map;
 
 template<
     typename Type,
     typename = std::hash<Type>,
     typename = stl::equal_to<>,
-    typename = std::allocator<Type>>
+    typename = stl::allocator<Type>>
 class dense_set;
 
 template<typename...>

src/entt/entity/fwd.hpp

@@ -29,10 +29,10 @@ enum class deletion_policy : stl::uint8_t {
 template<cvref_unqualified Type, typename Entity = entity>
 struct component_traits;
 
-template<typename Entity = entity, typename = std::allocator<Entity>>
+template<typename Entity = entity, typename = stl::allocator<Entity>>
 class basic_sparse_set;
 
-template<typename Type, typename = entity, typename = std::allocator<Type>>
+template<typename Type, typename = entity, typename = stl::allocator<Type>>
 class basic_storage;
 
 template<typename, typename>
@@ -41,13 +41,13 @@ class basic_sigh_mixin;
 template<typename, typename>
 class basic_reactive_mixin;
 
-template<typename Entity = entity, typename = std::allocator<Entity>>
+template<typename Entity = entity, typename = stl::allocator<Entity>>
 class basic_registry;
 
 template<typename, typename>
 class basic_view;
 
-template<typename Type, typename = std::allocator<Type *>>
+template<typename Type, typename = stl::allocator<Type *>>
 class basic_runtime_view;
 
 template<typename, typename, typename>
@@ -223,7 +223,7 @@ struct type_list_transform<owned_t<Type...>, Op> {
  * @tparam Entity A valid entity type.
  * @tparam Allocator Type of allocator used to manage memory and elements.
  */
-template<typename Type, typename Entity = entity, typename Allocator = std::allocator<Type>>
+template<typename Type, typename Entity = entity, typename Allocator = stl::allocator<Type>>
 struct storage_type {
     /*! @brief Type-to-storage conversion result. */
     using type = ENTT_STORAGE(sigh_mixin, basic_storage<Type, Entity, Allocator>);
@@ -256,7 +256,7 @@ using storage_type_t = storage_type<Args...>::type;
  * @tparam Entity A valid entity type.
  * @tparam Allocator Type of allocator used to manage memory and elements.
  */
-template<typename Type, typename Entity = entity, typename Allocator = std::allocator<stl::remove_const_t<Type>>>
+template<typename Type, typename Entity = entity, typename Allocator = stl::allocator<stl::remove_const_t<Type>>>
 struct storage_for {
     /*! @brief Type-to-storage conversion result. */
     using type = constness_as_t<storage_type_t<stl::remove_const_t<Type>, Entity, Allocator>, Type>;

src/entt/graph/fwd.hpp

@@ -14,10 +14,10 @@ struct directed_tag {};
 /*! @brief Directed graph category tag. */
 struct undirected_tag: directed_tag {};
 
-template<std::derived_from<directed_tag>, typename = std::allocator<stl::size_t>>
+template<std::derived_from<directed_tag>, typename = stl::allocator<stl::size_t>>
 class adjacency_matrix;
 
-template<typename = std::allocator<id_type>>
+template<typename = stl::allocator<id_type>>
 class basic_flow;
 
 /*! @brief Alias declaration for the most common use case. */

src/entt/process/fwd.hpp

@@ -6,13 +6,13 @@
 
 namespace entt {
 
-template<typename, typename = std::allocator<void>>
+template<typename, typename = stl::allocator<void>>
 class basic_process;
 
 /*! @brief Alias declaration for the most common use case. */
 using process = basic_process<stl::uint32_t>;
 
-template<typename, typename = std::allocator<void>>
+template<typename, typename = stl::allocator<void>>
 class basic_scheduler;
 
 /*! @brief Alias declaration for the most common use case. */

src/entt/resource/fwd.hpp

@@ -8,7 +8,7 @@ namespace entt {
 template<typename>
 struct resource_loader;
 
-template<typename Type, typename = resource_loader<Type>, typename = std::allocator<Type>>
+template<typename Type, typename = resource_loader<Type>, typename = stl::allocator<Type>>
 class resource_cache;
 
 template<typename>

src/entt/signal/fwd.hpp

@@ -8,10 +8,10 @@ namespace entt {
 template<typename>
 class delegate;
 
-template<typename = std::allocator<void>>
+template<typename = stl::allocator<void>>
 class basic_dispatcher;
 
-template<typename, typename = std::allocator<void>>
+template<typename, typename = stl::allocator<void>>
 class emitter;
 
 class connection;
@@ -21,7 +21,7 @@ struct scoped_connection;
 template<typename>
 class sink;
 
-template<typename Type, typename = std::allocator<void>>
+template<typename Type, typename = stl::allocator<void>>
 class sigh;
 
 /*! @brief Alias declaration for the most common use case. */

src/entt/stl/memory.hpp

@@ -8,6 +8,7 @@
 /*! @cond ENTT_INTERNAL */
 namespace entt::stl {
 
+using std::allocator;
 using std::allocator_arg;
 using std::allocator_arg_t;
 using std::allocator_traits;