diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2018-03-23 22:12:42 +0100 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2018-03-23 22:12:48 +0100 |
| commit | eab652fd52b7b806b9414a26a0bf5348df4282f6 (patch) | |
| tree | 38395781f2e1dffd100ac971843b52556fa0ee94 /src | |
| parent | 9293d8e2715f3e883fee4c0ed617636a785f20d1 (diff) | |
| download | minetest-eab652fd52b7b806b9414a26a0bf5348df4282f6.tar.gz minetest-eab652fd52b7b806b9414a26a0bf5348df4282f6.tar.bz2 minetest-eab652fd52b7b806b9414a26a0bf5348df4282f6.zip | |
Fix some gcc 7.3 reported warnings
```
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(); }
```
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/joystick_controller.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/client/joystick_controller.h b/src/client/joystick_controller.h index 6bea282ee..7baacd81b 100644 --- a/src/client/joystick_controller.h +++ b/src/client/joystick_controller.h @@ -60,6 +60,8 @@ struct JoystickButtonCmb : public JoystickCombination { this->key = key; } + virtual ~JoystickButtonCmb() = default; + virtual bool isTriggered(const irr::SEvent::SJoystickEvent &ev) const; u32 filter_mask; @@ -78,7 +80,9 @@ struct JoystickAxisCmb : public JoystickCombination { 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; |