summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-01 18:32:58 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-01 18:32:58 +0300
commit7b261cb926402f3d8e9b6ce0f9bdeaa26200fd5a (patch)
tree4f5a65868abf96fd53baf6b95eaddc1523834990
parent8a9cba471fe49fd73342ee0b7a898f29539edb20 (diff)
downloadmv-7b261cb926402f3d8e9b6ce0f9bdeaa26200fd5a.tar.gz
mv-7b261cb926402f3d8e9b6ce0f9bdeaa26200fd5a.tar.bz2
mv-7b261cb926402f3d8e9b6ce0f9bdeaa26200fd5a.tar.xz
mv-7b261cb926402f3d8e9b6ce0f9bdeaa26200fd5a.zip
Fix pointers alias issue in Being::playSfx (detected by gcc 7)
-rw-r--r--src/being/being.cpp2
-rw-r--r--src/being/being.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 1e63b9b98..90638ef55 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -4762,7 +4762,7 @@ void Being::addEffect(const std::string &restrict name) restrict2
}
void Being::playSfx(const SoundInfo &sound,
- Being *restrict const being,
+ Being *const being,
const bool main,
const int x, const int y) const restrict2
{
diff --git a/src/being/being.h b/src/being/being.h
index 9477abab5..ae4fe3dd8 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -900,7 +900,7 @@ class Being notfinal : public ActorSprite,
{ return mOwner; }
void playSfx(const SoundInfo &sound,
- Being *restrict const being,
+ Being *const being,
const bool main,
const int x, const int y) const restrict2;