From 80015e83d4eecb5028f80d91f2624d3dad34d3c9 Mon Sep 17 00:00:00 2001
From: Michele Caini <michele.caini@gmail.com>
Date: Wed, 20 Apr 2022 16:40:19 +0200
Subject: [PATCH] sigh/dispatcher: use allocator<void>

---
 src/entt/signal/dispatcher.hpp  | 5 ++---
 src/entt/signal/fwd.hpp         | 4 ++--
 src/entt/signal/sigh.hpp        | 1 -
 test/entt/signal/dispatcher.cpp | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/entt/signal/dispatcher.hpp b/src/entt/signal/dispatcher.hpp
index 35bbdd6d4..136ca71d8 100644
--- a/src/entt/signal/dispatcher.hpp
+++ b/src/entt/signal/dispatcher.hpp
@@ -38,7 +38,7 @@ class dispatcher_handler final: public basic_dispatcher_handler {
     static_assert(std::is_same_v<Type, std::decay_t<Type>>, "Invalid type");
 
     using alloc_traits = std::allocator_traits<Allocator>;
-    using signal_type = sigh<void(Type &), typename alloc_traits::template rebind_alloc<void (*)(Type &)>>;
+    using signal_type = sigh<void(Type &), Allocator>;
     using container_type = std::vector<Type, typename alloc_traits::template rebind_alloc<Type>>;
 
 public:
@@ -67,8 +67,7 @@ public:
     }
 
     [[nodiscard]] auto bucket() ENTT_NOEXCEPT {
-        using sink_type = typename sigh<void(Type &)>::sink_type;
-        return sink_type{signal};
+        return typename signal_type::sink_type{signal};
     }
 
     void trigger(Type event) {
diff --git a/src/entt/signal/fwd.hpp b/src/entt/signal/fwd.hpp
index 59df1ea52..82257a81a 100644
--- a/src/entt/signal/fwd.hpp
+++ b/src/entt/signal/fwd.hpp
@@ -8,7 +8,7 @@ namespace entt {
 template<typename>
 class delegate;
 
-template<typename = std::allocator<char>>
+template<typename = std::allocator<void>>
 class basic_dispatcher;
 
 template<typename>
@@ -21,7 +21,7 @@ struct scoped_connection;
 template<typename>
 class sink;
 
-template<typename Type, typename = std::allocator<Type *>>
+template<typename Type, typename = std::allocator<void>>
 class sigh;
 
 /*! @brief Alias declaration for the most common use case. */
diff --git a/src/entt/signal/sigh.hpp b/src/entt/signal/sigh.hpp
index bdbb9d30d..6badeeb55 100644
--- a/src/entt/signal/sigh.hpp
+++ b/src/entt/signal/sigh.hpp
@@ -57,7 +57,6 @@ class sigh<Ret(Args...), Allocator> {
     friend class sink<sigh<Ret(Args...), Allocator>>;
 
     using alloc_traits = std::allocator_traits<Allocator>;
-    static_assert(std::is_same_v<typename alloc_traits::value_type, Ret (*)(Args...)>, "Invalid value type");
     using container_type = std::vector<delegate<Ret(Args...)>, typename alloc_traits::template rebind_alloc<delegate<Ret(Args...)>>>;
 
 public:
diff --git a/test/entt/signal/dispatcher.cpp b/test/entt/signal/dispatcher.cpp
index a5c678dbb..9936f40f8 100644
--- a/test/entt/signal/dispatcher.cpp
+++ b/test/entt/signal/dispatcher.cpp
@@ -187,7 +187,7 @@ TEST(Dispatcher, NamedQueue) {
 }
 
 TEST(Dispatcher, CustomAllocator) {
-    std::allocator<char> allocator;
+    std::allocator<void> allocator;
     entt::dispatcher dispatcher{allocator};
 
     ASSERT_EQ(dispatcher.get_allocator(), allocator);