Skip to content
Permalink
Browse files

Fix C++11 violation that broke clang on Debian Stretch

  • Loading branch information...
Pedro Gimeno authored and SmallJoker committed Dec 16, 2018
1 parent 24cdbe9 commit e7367f0fa54b40cf94c2becaa66118906b182099
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/serverobject.h
@@ -148,7 +148,7 @@ class ServerActiveObject : public ActiveObject
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 @@ class ServerActiveObject : public ActiveObject
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; }

0 comments on commit e7367f0

Please sign in to comment.
You can’t perform that action at this time.