Jordach
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Pedro Gimeno 2018-12-16 18:44:23 +01:00 committed by SmallJoker
parent 24cdbe9bf5
commit e7367f0fa5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/serverobject.h
View File

@ -148,7 +148,7 @@ public:
virtual void setArmorGroups(const ItemGroupList &armor_groups) virtual void setArmorGroups(const ItemGroupList &armor_groups)
{} {}
virtual const ItemGroupList &getArmorGroups() 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 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) 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 void removeAttachmentChild(int child_id)
{} {}
virtual const std::unordered_set<int> &getAttachmentChildIds() 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 ServerActiveObject *getParent() const { return nullptr; }
virtual ObjectProperties* accessObjectProperties() virtual ObjectProperties* accessObjectProperties()
{ return NULL; } { return NULL; }