summaryrefslogtreecommitdiff
path: root/src/input_common/sdl/sdl.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-03-21 00:20:49 -0400
committerGitHub <noreply@github.com>2019-03-21 00:20:49 -0400
commit839c0f829b109da8e7c69fe17dd5b054b54a12ac (patch)
tree9b073f88df08681710d89ebd46de1c1b2d79e47a /src/input_common/sdl/sdl.h
parent109b78a6d6c42a665ce9a86a2aca4166eadb0957 (diff)
parenteb335f51ca15774330219a9c65778db39cdebac1 (diff)
Merge pull request #2260 from lioncash/sdl
input_common/sdl: Correct return values within GetPollers implementations
Diffstat (limited to 'src/input_common/sdl/sdl.h')
-rw-r--r--src/input_common/sdl/sdl.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/input_common/sdl/sdl.h b/src/input_common/sdl/sdl.h
index 02a8d2e2c..d7f24c68a 100644
--- a/src/input_common/sdl/sdl.h
+++ b/src/input_common/sdl/sdl.h
@@ -24,17 +24,19 @@ namespace InputCommon::SDL {
class State {
public:
- /// Unresisters SDL device factories and shut them down.
+ using Pollers = std::vector<std::unique_ptr<Polling::DevicePoller>>;
+
+ /// Unregisters SDL device factories and shut them down.
virtual ~State() = default;
- virtual std::vector<std::unique_ptr<InputCommon::Polling::DevicePoller>> GetPollers(
- InputCommon::Polling::DeviceType type) = 0;
+ virtual Pollers GetPollers(Polling::DeviceType type) = 0;
};
class NullState : public State {
public:
- std::vector<std::unique_ptr<InputCommon::Polling::DevicePoller>> GetPollers(
- InputCommon::Polling::DeviceType type) override {}
+ Pollers GetPollers(Polling::DeviceType type) override {
+ return {};
+ }
};
std::unique_ptr<State> Init();