Added missed template parameter to getEvent.

lvyanhui · Dec 8, 2018 · a3225c1 · a3225c1
1 parent b8b6600
commit a3225c1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/doc/policies.md b/doc/policies.md
@@ -16,6 +16,7 @@ The same policy mechanism applies to all three classes, EventDispatcher, EventQu
 **Apply**: EventDispatcher, EventQueue.
 
 eventpp forwards all arguments of `EventDispatcher::dispatch` and `EventQueue::enqueue` (both has same arguments) to `getEvent` to get the event type, then invokes the callback list of the event type.  
+`getEvent` can be non-template or template function. It works as long as `getEvent` can be invoked using the same arguments as `EventDispatcher::dispatch` and `EventQueue::enqueue`.  
 
 Sample code
 

diff --git a/include/eventpp/eventdispatcher.h b/include/eventpp/eventdispatcher.h
@@ -210,7 +210,7 @@ class EventDispatcherBase <
 	{
 		static_assert(ArgumentPassingMode::canExcludeEventType, "Dispatching arguments count doesn't match required (Event type should NOT be included).");
 
-		using GetEvent = typename SelectGetEvent<Policies, EventType, HasFunctionGetEvent<Policies, Args...>::value>::Type;
+		using GetEvent = typename SelectGetEvent<Policies, EventType, HasFunctionGetEvent<Policies, T &&, Args...>::value>::Type;
 
 		doDispatch(
 			GetEvent::getEvent(std::forward<T>(first), args...),

diff --git a/include/eventpp/eventqueue.h b/include/eventpp/eventqueue.h
@@ -233,7 +233,7 @@ class EventQueueBase <
 	{
 		static_assert(super::ArgumentPassingMode::canExcludeEventType, "Enqueuing arguments count doesn't match required (Event type should NOT be included).");
 
-		using GetEvent = typename SelectGetEvent<Policies, EventType, HasFunctionGetEvent<Policies, Args...>::value>::Type;
+		using GetEvent = typename SelectGetEvent<Policies, EventType, HasFunctionGetEvent<Policies, T &&, Args...>::value>::Type;
 
 		doEnqueue(QueuedEvent(
 			GetEvent::getEvent(std::forward<T>(first), args...),