diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2012-03-25 04:06:43 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-03-25 04:06:45 +0300 |
| commit | 04085cad3cc154a48c72127ef816bf25ca636f74 (patch) | |
| tree | 7fcf3ca0628470a96a34e2adc133464025d25f24 /src/event_manager.h | |
| parent | c8997e48c070b8fcc460f01ba90896ad3afbf8b5 (diff) | |
| download | minetest-04085cad3cc154a48c72127ef816bf25ca636f74.tar.gz minetest-04085cad3cc154a48c72127ef816bf25ca636f74.tar.bz2 minetest-04085cad3cc154a48c72127ef816bf25ca636f74.zip | |
Make event_manager.h build on MSVC
Diffstat (limited to 'src/event_manager.h')
| -rw-r--r-- | src/event_manager.h | 20 |
1 files 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<std::string, Dest>::iterator i = m_dest.find(type); if(i != m_dest.end()){ std::list<FuncSpec> &funcs = i->second.funcs; - std::list<FuncSpec>::iterator i = funcs.begin(); - while(i != funcs.end()){ - bool remove = (i->f == f && (!data || i->d == data)); + std::list<FuncSpec>::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<std::string, Dest>::iterator i = m_dest.begin(); i != m_dest.end(); i++){ std::list<FuncSpec> &funcs = i->second.funcs; - std::list<FuncSpec>::iterator i = funcs.begin(); - while(i != funcs.end()){ - bool remove = (i->f == f && (!data || i->d == data)); + std::list<FuncSpec>::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++; } } } |