Panagiotis Christopoulos Charitos 7 лет назад
Родитель
Сommit
183e6039e9
2 измененных файлов с 5 добавлено и 20 удалено
  1. 5 5
      src/anki/scene/events/EventManager.cpp
  2. 0 15
      src/anki/scene/events/EventManager.h

+ 5 - 5
src/anki/scene/events/EventManager.cpp

@@ -16,11 +16,11 @@ EventManager::EventManager()
 
 EventManager::~EventManager()
 {
-	Error err = iterateEvents([&](Event& event) -> Error {
-		event.setMarkedForDeletion();
-		return Error::NONE;
-	});
-	(void)err;
+	while(!m_events.isEmpty())
+	{
+		Event* event = &m_events.getFront();
+		event->setMarkedForDeletion();
+	}
 
 	deleteEventsMarkedForDeletion();
 }

+ 0 - 15
src/anki/scene/events/EventManager.h

@@ -37,21 +37,6 @@ public:
 	SceneAllocator<U8> getAllocator() const;
 	SceneFrameAllocator<U8> getFrameAllocator() const;
 
-	/// Iterate events
-	template<typename Func>
-	ANKI_USE_RESULT Error iterateEvents(Func func)
-	{
-		Error err = Error::NONE;
-		auto it = m_events.getBegin();
-		auto end = m_events.getEnd();
-		for(; it != end && !err; ++it)
-		{
-			err = func(*it);
-		}
-
-		return err;
-	}
-
 	/// Create a new event
 	/// @note It's thread-safe against itself.
 	template<typename T, typename... Args>