From 874826b6ddef20f190013f24021d20e0338d5593 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 18 Mar 2019 11:26:13 -0400 Subject: input_common/sdl: Use a type alias to shorten declaration of GetPollers Just makes the definitions a little bit more tidy. --- src/input_common/sdl/sdl.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/input_common/sdl/sdl.h') diff --git a/src/input_common/sdl/sdl.h b/src/input_common/sdl/sdl.h index 02a8d2e2c..940ca7f1b 100644 --- a/src/input_common/sdl/sdl.h +++ b/src/input_common/sdl/sdl.h @@ -24,17 +24,17 @@ namespace InputCommon::SDL { class State { public: - /// Unresisters SDL device factories and shut them down. + using Pollers = std::vector>; + + /// Unregisters SDL device factories and shut them down. virtual ~State() = default; - virtual std::vector> GetPollers( - InputCommon::Polling::DeviceType type) = 0; + virtual Pollers GetPollers(Polling::DeviceType type) = 0; }; class NullState : public State { public: - std::vector> GetPollers( - InputCommon::Polling::DeviceType type) override {} + Pollers GetPollers(Polling::DeviceType type) override {} }; std::unique_ptr Init(); -- cgit v1.2.3 From eb335f51ca15774330219a9c65778db39cdebac1 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 18 Mar 2019 11:32:49 -0400 Subject: input_common/sdl: Correct return values within implementations of GetPollers() In both cases, we weren't actually returning anything, which is undefined behavior. --- src/input_common/sdl/sdl.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/input_common/sdl/sdl.h') diff --git a/src/input_common/sdl/sdl.h b/src/input_common/sdl/sdl.h index 940ca7f1b..d7f24c68a 100644 --- a/src/input_common/sdl/sdl.h +++ b/src/input_common/sdl/sdl.h @@ -34,7 +34,9 @@ public: class NullState : public State { public: - Pollers GetPollers(Polling::DeviceType type) override {} + Pollers GetPollers(Polling::DeviceType type) override { + return {}; + } }; std::unique_ptr Init(); -- cgit v1.2.3