From 22635c1800c7c4fd803b3954e20777c43fd590ba Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 5 Sep 2015 22:32:05 -0400 Subject: Add missing override specifiers --- .../ControllerInterface/ForceFeedback/ForceFeedbackDevice.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Source/Core/InputCommon/ControllerInterface/ForceFeedback') diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h index a528c00602..57364bd160 100644 --- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h +++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h @@ -29,9 +29,10 @@ private: class Force : public Output { public: - std::string GetName() const; Force(const std::string& name, LPDIRECTINPUTEFFECT iface); ~Force(); + + std::string GetName() const override; void SetState(ControlState state); void Update(); void Stop(); -- cgit v1.2.3 From c3332604fa2e8dd7b41d8f28883fe3606261db32 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 17 Sep 2015 15:13:41 -0400 Subject: ControllerInterface: Fix -Winconsistent-missing-override warnings on OSX --- .../InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/InputCommon/ControllerInterface/ForceFeedback') diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h index 57364bd160..f49198f037 100644 --- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h +++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h @@ -33,7 +33,7 @@ private: ~Force(); std::string GetName() const override; - void SetState(ControlState state); + void SetState(ControlState state) override; void Update(); void Stop(); private: -- cgit v1.2.3