summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-03-18 16:32:49 +0100
committerLioncash <mathew1800@gmail.com>2019-03-18 16:40:38 +0100
commiteb335f51ca15774330219a9c65778db39cdebac1 (patch)
tree80b2280dbfadad42b685f7e9eda7ef8bd479b689
parentinput_common/sdl: Use a type alias to shorten declaration of GetPollers (diff)
downloadyuzu-eb335f51ca15774330219a9c65778db39cdebac1.tar
yuzu-eb335f51ca15774330219a9c65778db39cdebac1.tar.gz
yuzu-eb335f51ca15774330219a9c65778db39cdebac1.tar.bz2
yuzu-eb335f51ca15774330219a9c65778db39cdebac1.tar.lz
yuzu-eb335f51ca15774330219a9c65778db39cdebac1.tar.xz
yuzu-eb335f51ca15774330219a9c65778db39cdebac1.tar.zst
yuzu-eb335f51ca15774330219a9c65778db39cdebac1.zip
-rw-r--r--src/input_common/sdl/sdl.h4
-rw-r--r--src/input_common/sdl/sdl_impl.cpp4
2 files changed, 6 insertions, 2 deletions
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<State> Init();
diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp
index f44a4a332..b132d77f5 100644
--- a/src/input_common/sdl/sdl_impl.cpp
+++ b/src/input_common/sdl/sdl_impl.cpp
@@ -652,6 +652,7 @@ private:
SDLState::Pollers SDLState::GetPollers(InputCommon::Polling::DeviceType type) {
Pollers pollers;
+
switch (type) {
case InputCommon::Polling::DeviceType::Analog:
pollers.emplace_back(std::make_unique<Polling::SDLAnalogPoller>(*this));
@@ -659,8 +660,9 @@ SDLState::Pollers SDLState::GetPollers(InputCommon::Polling::DeviceType type) {
case InputCommon::Polling::DeviceType::Button:
pollers.emplace_back(std::make_unique<Polling::SDLButtonPoller>(*this));
break;
- return pollers;
}
+
+ return pollers;
}
} // namespace SDL