diff --git a/src/entt/container/dense_map.hpp b/src/entt/container/dense_map.hpp index a1607998e..77bc5c3c4 100644 --- a/src/entt/container/dense_map.hpp +++ b/src/entt/container/dense_map.hpp @@ -39,15 +39,15 @@ struct dense_map_node final { element{stl::forward(args)...} {} template - dense_map_node(std::allocator_arg_t, const auto &allocator, const stl::size_t pos, Args &&...args) + dense_map_node(stl::allocator_arg_t, const auto &allocator, const stl::size_t pos, Args &&...args) : next{pos}, element{entt::make_obj_using_allocator(allocator, stl::forward(args)...)} {} - dense_map_node(std::allocator_arg_t, const auto &allocator, const dense_map_node &other) + dense_map_node(stl::allocator_arg_t, const auto &allocator, const dense_map_node &other) : next{other.next}, element{entt::make_obj_using_allocator(allocator, other.element)} {} - dense_map_node(std::allocator_arg_t, const auto &allocator, dense_map_node &&other) + dense_map_node(stl::allocator_arg_t, const auto &allocator, dense_map_node &&other) : next{other.next}, element{entt::make_obj_using_allocator(allocator, stl::move(other.element))} {} diff --git a/src/entt/core/memory.hpp b/src/entt/core/memory.hpp index 7eefe189f..dfc636e9b 100644 --- a/src/entt/core/memory.hpp +++ b/src/entt/core/memory.hpp @@ -123,8 +123,8 @@ struct uses_allocator_construction { } else { static_assert(std::uses_allocator_v, "Ill-formed request"); - if constexpr(stl::is_constructible_v) { - return stl::tuple{std::allocator_arg, allocator, stl::forward(params)...}; + if constexpr(stl::is_constructible_v) { + return stl::tuple{stl::allocator_arg, allocator, stl::forward(params)...}; } else { static_assert(stl::is_constructible_v, "Ill-formed request"); return stl::forward_as_tuple(stl::forward(params)..., allocator); diff --git a/src/entt/locator/locator.hpp b/src/entt/locator/locator.hpp index ec6252ba1..4c8c5ed53 100644 --- a/src/entt/locator/locator.hpp +++ b/src/entt/locator/locator.hpp @@ -115,7 +115,7 @@ public: */ template Type = Service, typename... Args> requires std::constructible_from - static Service &emplace(std::allocator_arg_t, auto alloc, Args &&...args) { + static Service &emplace(stl::allocator_arg_t, auto alloc, Args &&...args) { service = std::allocate_shared(alloc, stl::forward(args)...); return *service; } diff --git a/src/entt/stl/memory.hpp b/src/entt/stl/memory.hpp index 88dd36b61..96a1ad64d 100644 --- a/src/entt/stl/memory.hpp +++ b/src/entt/stl/memory.hpp @@ -8,6 +8,8 @@ /*! @cond ENTT_INTERNAL */ namespace entt::stl { +using std::allocator_arg; +using std::allocator_arg_t; using std::allocator_traits; using std::make_unique; using std::pointer_traits;