Parcourir la source

stl: std::uses_allocator_v

skypjack il y a 2 semaines
Parent
commit
0a62b17fce
3 fichiers modifiés avec 4 ajouts et 3 suppressions
  1. 1 1
      src/entt/container/table.hpp
  2. 2 2
      src/entt/core/memory.hpp
  3. 1 0
      src/entt/stl/memory.hpp

+ 1 - 1
src/entt/container/table.hpp

@@ -424,7 +424,7 @@ namespace std {
 
 template<typename... Container, typename Allocator>
 struct uses_allocator<entt::basic_table<Container...>, Allocator>
-    : entt::stl::bool_constant<(std::uses_allocator_v<Container, Allocator> && ...)> {};
+    : entt::stl::bool_constant<(entt::stl::uses_allocator_v<Container, Allocator> && ...)> {};
 
 } // namespace std
 /*! @endcond */

+ 2 - 2
src/entt/core/memory.hpp

@@ -118,10 +118,10 @@ template<typename Type>
 struct uses_allocator_construction {
     template<typename Allocator, typename... Params>
     static constexpr auto args([[maybe_unused]] const Allocator &allocator, Params &&...params) noexcept {
-        if constexpr(!std::uses_allocator_v<Type, Allocator> && stl::is_constructible_v<Type, Params...>) {
+        if constexpr(!stl::uses_allocator_v<Type, Allocator> && stl::is_constructible_v<Type, Params...>) {
             return stl::forward_as_tuple(stl::forward<Params>(params)...);
         } else {
-            static_assert(std::uses_allocator_v<Type, Allocator>, "Ill-formed request");
+            static_assert(stl::uses_allocator_v<Type, Allocator>, "Ill-formed request");
 
             if constexpr(stl::is_constructible_v<Type, stl::allocator_arg_t, const Allocator &, Params...>) {
                 return stl::tuple<stl::allocator_arg_t, const Allocator &, Params &&...>{stl::allocator_arg, allocator, stl::forward<Params>(params)...};

+ 1 - 0
src/entt/stl/memory.hpp

@@ -24,6 +24,7 @@ using std::shared_ptr;
 using std::static_pointer_cast;
 using std::uninitialized_fill;
 using std::unique_ptr;
+using std::uses_allocator_v;
 
 } // namespace entt::stl