Merge remote-tracking branch 'origin/master' into GLrenderer

2015-09-16 16:17:39 +02:00
parent 12273f66af 12dc837f51
commit a5ffce8db8
6 changed files with 124 additions and 9 deletions
@@ -121,8 +121,6 @@ public:
 	int Process(std::string contextTypeName);
 	void Clear();
 	void Unsubscribe(BaseEventRelay &relay);
-	template <typename ContextType>
-	void UnsubscribeAll();

 private:
 	typedef std::string ContextTypeName_t; // typeid(ContextType).name()
@@ -156,13 +154,6 @@ int EventBroker::Process()
 	return Process(contextTypeName);
 }

-template <typename ContextType>
-void EventBroker::UnsubscribeAll()
-{
-	const std::string contextTypeName = typeid(ContextType).name();
-	m_ContextRelays.erase(contextTypeName);
-}
-
 }

 #endif // MessageRelay_h__