Skip to content

Commit e7367f0

Browse files
Pedro GimenoSmallJoker
Pedro Gimeno
authored andcommittedDec 16, 2018
Fix C++11 violation that broke clang on Debian Stretch
1 parent 24cdbe9 commit e7367f0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed
 

Diff for: ‎src/serverobject.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ class ServerActiveObject : public ActiveObject
148148
virtual void setArmorGroups(const ItemGroupList &armor_groups)
149149
{}
150150
virtual const ItemGroupList &getArmorGroups()
151-
{ static const ItemGroupList rv; return rv; }
151+
{ static ItemGroupList rv; return rv; }
152152
virtual void setPhysicsOverride(float physics_override_speed, float physics_override_jump, float physics_override_gravity)
153153
{}
154154
virtual void setAnimation(v2f frames, float frame_speed, float frame_blend, bool frame_loop)
@@ -172,7 +172,7 @@ class ServerActiveObject : public ActiveObject
172172
virtual void removeAttachmentChild(int child_id)
173173
{}
174174
virtual const std::unordered_set<int> &getAttachmentChildIds()
175-
{ static const std::unordered_set<int> rv; return rv; }
175+
{ static std::unordered_set<int> rv; return rv; }
176176
virtual ServerActiveObject *getParent() const { return nullptr; }
177177
virtual ObjectProperties* accessObjectProperties()
178178
{ return NULL; }

0 commit comments

Comments
 (0)
Please sign in to comment.