summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-27 23:59:04 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-27 23:59:04 +0300
commit4bb2d76c5d836c5c1aaea0bd63d2dda99f0e76f6 (patch)
tree9a37b7976d86e526999506ed07aa9a49957e6c93
parentcff45e3874cb71ed89f97d04f04bcb5da93ab010 (diff)
downloadmv-4bb2d76c5d836c5c1aaea0bd63d2dda99f0e76f6.tar.gz
mv-4bb2d76c5d836c5c1aaea0bd63d2dda99f0e76f6.tar.bz2
mv-4bb2d76c5d836c5c1aaea0bd63d2dda99f0e76f6.tar.xz
mv-4bb2d76c5d836c5c1aaea0bd63d2dda99f0e76f6.zip
Fix compilation with different flags.
-rw-r--r--src/being/actor.h2
-rw-r--r--src/resources/map/map.cpp2
-rw-r--r--src/resources/map/map.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/being/actor.h b/src/being/actor.h
index 970d85ede..f76f7ba09 100644
--- a/src/being/actor.h
+++ b/src/being/actor.h
@@ -32,7 +32,7 @@ class Actor;
class Graphics;
class Map;
-typedef std::list<Actor*restrict2> Actors;
+typedef std::list<Actor*> Actors;
typedef Actors::const_iterator ActorsCIter;
class Actor notfinal
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index e1c7e6938..ddb657875 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -785,7 +785,7 @@ const MetaTile *Map::getMetaTile(const int x, const int y) const restrict2
return &mMetaTiles[x + y * mWidth];
}
-Actors::iterator Map::addActor(Actor *restrict2 const actor) restrict2
+Actors::iterator Map::addActor(Actor *const actor) restrict2
{
mActors.push_front(actor);
// mSpritesUpdated = true;
diff --git a/src/resources/map/map.h b/src/resources/map/map.h
index e9bb405f4..b4495d11d 100644
--- a/src/resources/map/map.h
+++ b/src/resources/map/map.h
@@ -364,7 +364,7 @@ class Map final : public Properties, public ConfigListener
/**
* Adds an actor to the map.
*/
- Actors::iterator addActor(Actor *restrict2 const actor) restrict2;
+ Actors::iterator addActor(Actor *const actor) restrict2;
/**
* Removes an actor from the map.