summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface
diff options
context:
space:
mode:
authorcomex <comexk@gmail.com>2015-06-21 15:28:49 -0400
committercomex <comexk@gmail.com>2015-06-21 15:42:49 -0400
commit700b850acdb4895a6f70942d1470e998d76819c1 (patch)
tree484b0f0a9e208d0df0b2152a64775b478976700d /Source/Core/InputCommon/ControllerInterface
parentd180e4469ee200494b4c78b448c1984dfdfbecff (diff)
Fix misc. clang warnings - mostly complaints about inconsistent use of override.
Previously, MacOpenFile only overrode anything on OS X; otherwise it was just a useless method, which is presumably why it wasn't marked override in the first place. Address this more sanely by wrapping it in #ifdef __APPLE__.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
index 973bd1fefd..4be67a503c 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
@@ -57,9 +57,9 @@ public:
Keyboard(IOHIDDeviceRef device, std::string name, int index, void *window);
- std::string GetName() const;
- std::string GetSource() const;
- int GetId() const;
+ std::string GetName() const override;
+ std::string GetSource() const override;
+ int GetId() const override;
private:
struct