BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix some gcc 7.3 reported warnings

Browse Source 
```
src/client/joystick_controller.h:85:2: warning: duplicate 'virtual' declaration specifier [-Wduplicate-decl-specifier]
        virtual bool isTriggered(const irr::SEvent::SJoystickEvent &ev) const;
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/ext/new_allocator.h:140:22: warning: destructor called on non-final 'JoystickAxisCmb' that has virtual functions but non-virtual destructor [-Wdelete-non-virtual-dtor]
                destroy(_Up* __p) { __p->~_Up(); }
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/ext/new_allocator.h:140:22: warning: destructor called on non-final 'JoystickButtonCmb' that has virtual functions but non-virtual destructor [-Wdelete-non-virtual-dtor]
        destroy(_Up* __p) { __p->~_Up(); }
```
This commit is contained in:
Loic Blot 2018-03-23 22:12:42 +01:00
parent 9293d8e271
commit eab652fd52
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/joystick_controller.h
View File

@ -60,6 +60,8 @@ struct JoystickButtonCmb : public JoystickCombination {
this->key = key; this->key = key;
} }
virtual ~JoystickButtonCmb() = default;
virtual bool isTriggered(const irr::SEvent::SJoystickEvent &ev) const; virtual bool isTriggered(const irr::SEvent::SJoystickEvent &ev) const;
u32 filter_mask; u32 filter_mask;
@ -78,7 +80,9 @@ struct JoystickAxisCmb : public JoystickCombination {
this->key = key; this->key = key;
} }
virtual bool isTriggered(const irr::SEvent::SJoystickEvent &ev) const; virtual ~JoystickAxisCmb() = default;
bool isTriggered(const irr::SEvent::SJoystickEvent &ev) const override;
u16 axis_to_compare; u16 axis_to_compare;