From 700b850acdb4895a6f70942d1470e998d76819c1 Mon Sep 17 00:00:00 2001 From: comex Date: Sun, 21 Jun 2015 15:28:49 -0400 Subject: 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__. --- Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface') 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 -- cgit v1.2.3