Fix C++11 violation that broke clang on Debian Stretch
authorPedro Gimeno <4267396+pgimeno@users.noreply.github.com>
Sun, 16 Dec 2018 17:44:23 +0000 (18:44 +0100)
committerSmallJoker <mk939@ymail.com>
Sun, 16 Dec 2018 19:08:25 +0000 (20:08 +0100)
src/serverobject.h

index 04d52425de451ce830b65bb632add7c8b3d878c9..c20ec07e7c600034ba5fd6715cf551c0e79fb306 100644 (file)
@@ -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; }