From e7367f0fa54b40cf94c2becaa66118906b182099 Mon Sep 17 00:00:00 2001 From: Pedro Gimeno <4267396+pgimeno@users.noreply.github.com> Date: Sun, 16 Dec 2018 18:44:23 +0100 Subject: [PATCH] Fix C++11 violation that broke clang on Debian Stretch --- src/serverobject.h | 4 ++-- 1 file 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 &getAttachmentChildIds() - { static const std::unordered_set rv; return rv; } + { static std::unordered_set rv; return rv; } virtual ServerActiveObject *getParent() const { return nullptr; } virtual ObjectProperties* accessObjectProperties() { return NULL; }