skypjack 4 недель назад
Родитель
Сommit
4e191a95f4
2 измененных файлов с 2 добавлено и 3 удалено
  1. 2 2
      test/common/throwing_allocator.hpp
  2. 0 1
      test/common/transparent_equal_to.h

+ 2 - 2
test/common/throwing_allocator.hpp

@@ -20,13 +20,13 @@ class throwing_allocator {
     friend class throwing_allocator;
 
     template<typename Other>
-    requires (!std::is_void_v<Type> || std::constructible_from<std::allocator<Type>, std::allocator<Other>>)
+    requires (!std::same_as<Type, void> || std::constructible_from<std::allocator<Type>, std::allocator<Other>>)
     throwing_allocator(int, const throwing_allocator<Other> &other)
         : allocator{other.allocator},
           config{other.config} {}
 
     template<typename Other>
-    requires std::is_void_v<Type> || std::constructible_from<std::allocator<Type>, std::allocator<Other>>
+    requires std::same_as<Type, void> || std::constructible_from<std::allocator<Type>, std::allocator<Other>>
     throwing_allocator(char, const throwing_allocator<Other> &other)
         : allocator{},
           config{other.config} {}

+ 0 - 1
test/common/transparent_equal_to.h

@@ -2,7 +2,6 @@
 #define ENTT_COMMON_TRANSPARENT_EQUAL_TO_H
 
 #include <concepts>
-#include <type_traits>
 
 namespace test {