diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-02-20 15:02:34 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-02-20 15:02:34 +0300 |
| commit | 2577a25f8a4acf587526809fda2ded95875e1222 (patch) | |
| tree | eac452220603d35f1791685e1f08c482f8b18715 | |
| parent | 7221f5dd436a8534c6797718f2c83b0fb5f8b136 (diff) | |
| download | manaplus-2577a25f8a4acf587526809fda2ded95875e1222.tar.gz manaplus-2577a25f8a4acf587526809fda2ded95875e1222.tar.bz2 manaplus-2577a25f8a4acf587526809fda2ded95875e1222.tar.xz manaplus-2577a25f8a4acf587526809fda2ded95875e1222.zip | |
Rename internal variables in for macroses.
| -rw-r--r-- | src/actormanager.cpp | 4 | ||||
| -rw-r--r-- | src/localconsts.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp index 0f3734997..1b454406a 100644 --- a/src/actormanager.cpp +++ b/src/actormanager.cpp @@ -64,10 +64,10 @@ #include "debug.h" #define for_actors for (ActorSpritesConstIterator it = mActors.begin(), \ - it_end = mActors.end() ; it != it_end; ++it) + it_fend = mActors.end() ; it != it_fend; ++it) #define for_actorsm for (ActorSpritesIterator it = mActors.begin(), \ - it_end = mActors.end() ; it != it_end; ++it) + it_fend = mActors.end() ; it != it_fend; ++it) ActorManager *actorManager = nullptr; diff --git a/src/localconsts.h b/src/localconsts.h index 5037aa595..2d3aa030b 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -179,13 +179,13 @@ #define notfinal #define FOR_EACH(type, iter, array) for (type iter = array.begin(), \ - iter##_end = array.end(); iter != iter##_end; ++ iter) + iter##_fend = array.end(); iter != iter##_fend; ++ iter) #define FOR_EACHR(type, iter, array) for (type iter = array.rbegin(), \ - iter##_end = array.rend(); iter != iter##_end; ++ iter) + iter##_fend = array.rend(); iter != iter##_fend; ++ iter) #define FOR_EACHP(type, iter, array) for (type iter = array->begin(), \ - iter##_end = array->end(); iter != iter##_end; ++ iter) + iter##_fend = array->end(); iter != iter##_fend; ++ iter) #ifdef ENABLE_CHECKPLUGIN #define A_NONNULLPOINTER __attribute__((nonnullpointer)) |