diff options
| author | Pedro Gimeno <4267396+pgimeno@users.noreply.github.com> | 2018-12-16 18:44:23 +0100 |
|---|---|---|
| committer | SmallJoker <mk939@ymail.com> | 2018-12-16 20:08:25 +0100 |
| commit | e7367f0fa54b40cf94c2becaa66118906b182099 (patch) | |
| tree | 927aca83f97e542d1d76e873863018076d9bc892 /src/serverobject.h | |
| parent | 24cdbe9bf5fae88d76252add1b4ba0f8a7d48697 (diff) | |
| download | minetest-e7367f0fa54b40cf94c2becaa66118906b182099.tar.gz minetest-e7367f0fa54b40cf94c2becaa66118906b182099.tar.bz2 minetest-e7367f0fa54b40cf94c2becaa66118906b182099.zip | |
Fix C++11 violation that broke clang on Debian Stretch
Diffstat (limited to 'src/serverobject.h')
| -rw-r--r-- | src/serverobject.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/serverobject.h b/src/serverobject.h index 04d52425d..c20ec07e7 100644 --- a/src/serverobject.h +++ b/src/serverobject.h @@ -148,7 +148,7 @@ public: virtual void setArmorGroups(const ItemGroupList &armor_groups) {} virtual const ItemGroupList &getArmorGroups() - { static const ItemGroupList rv; return rv; } + { static ItemGroupList rv; return rv; } virtual void setPhysicsOverride(float physics_override_speed, float physics_override_jump, float physics_override_gravity) {} virtual void setAnimation(v2f frames, float frame_speed, float frame_blend, bool frame_loop) @@ -172,7 +172,7 @@ public: virtual void removeAttachmentChild(int child_id) {} virtual const std::unordered_set<int> &getAttachmentChildIds() - { static const std::unordered_set<int> rv; return rv; } + { static std::unordered_set<int> rv; return rv; } virtual ServerActiveObject *getParent() const { return nullptr; } virtual ObjectProperties* accessObjectProperties() { return NULL; } |