From 04085cad3cc154a48c72127ef816bf25ca636f74 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sun, 25 Mar 2012 04:06:43 +0300 Subject: Make event_manager.h build on MSVC --- src/event_manager.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/event_manager.h b/src/event_manager.h index b33d5a295..9492a2fd9 100644 --- a/src/event_manager.h +++ b/src/event_manager.h @@ -77,26 +77,26 @@ public: std::map::iterator i = m_dest.find(type); if(i != m_dest.end()){ std::list &funcs = i->second.funcs; - std::list::iterator i = funcs.begin(); - while(i != funcs.end()){ - bool remove = (i->f == f && (!data || i->d == data)); + std::list::iterator j = funcs.begin(); + while(j != funcs.end()){ + bool remove = (j->f == f && (!data || j->d == data)); if(remove) - funcs.erase(i++); + funcs.erase(j++); else - i++; + j++; } } } else{ for(std::map::iterator i = m_dest.begin(); i != m_dest.end(); i++){ std::list &funcs = i->second.funcs; - std::list::iterator i = funcs.begin(); - while(i != funcs.end()){ - bool remove = (i->f == f && (!data || i->d == data)); + std::list::iterator j = funcs.begin(); + while(j != funcs.end()){ + bool remove = (j->f == f && (!data || j->d == data)); if(remove) - funcs.erase(i++); + funcs.erase(j++); else - i++; + j++; } } } -- cgit v1.2.3