From e19972dfc4697f765cc8008a2b202b407f939551 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 25 Jul 2020 03:35:40 -0400 Subject: gc_poller: Resolve -Wredundant-move warning --- src/input_common/gcadapter/gc_poller.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/input_common/gcadapter/gc_poller.cpp') diff --git a/src/input_common/gcadapter/gc_poller.cpp b/src/input_common/gcadapter/gc_poller.cpp index 96e22d3ad..65454cb42 100644 --- a/src/input_common/gcadapter/gc_poller.cpp +++ b/src/input_common/gcadapter/gc_poller.cpp @@ -76,8 +76,7 @@ std::unique_ptr GCButtonFactory::Create(const Common::Param // button is not an axis/stick button if (button_id != PAD_STICK_ID) { - auto button = std::make_unique(port, button_id, adapter.get()); - return std::move(button); + return std::make_unique(port, button_id, adapter.get()); } // For Axis buttons, used by the binary sticks. -- cgit v1.2.3 From 04699c366b4a1c086b257b8f02780936b1bf0b9f Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 25 Jul 2020 03:37:22 -0400 Subject: gc_poller: Resolve -Wsign-compare warning --- src/input_common/gcadapter/gc_poller.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/input_common/gcadapter/gc_poller.cpp') diff --git a/src/input_common/gcadapter/gc_poller.cpp b/src/input_common/gcadapter/gc_poller.cpp index 65454cb42..f45983f3f 100644 --- a/src/input_common/gcadapter/gc_poller.cpp +++ b/src/input_common/gcadapter/gc_poller.cpp @@ -263,7 +263,8 @@ Common::ParamPackage GCAnalogFactory::GetNextInput() { if (analog_x_axis == -1) { analog_x_axis = axis; controller_number = static_cast(port); - } else if (analog_y_axis == -1 && analog_x_axis != axis && controller_number == port) { + } else if (analog_y_axis == -1 && analog_x_axis != axis && + controller_number == static_cast(port)) { analog_y_axis = axis; } } -- cgit v1.2.3