From e19972dfc4697f765cc8008a2b202b407f939551 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 25 Jul 2020 03:35:40 -0400 Subject: [PATCH 1/3] gc_poller: Resolve -Wredundant-move warning --- src/input_common/gcadapter/gc_poller.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/input_common/gcadapter/gc_poller.cpp b/src/input_common/gcadapter/gc_poller.cpp index 96e22d3ad9..65454cb422 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. From 04699c366b4a1c086b257b8f02780936b1bf0b9f Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 25 Jul 2020 03:37:22 -0400 Subject: [PATCH 2/3] gc_poller: Resolve -Wsign-compare warning --- src/input_common/gcadapter/gc_poller.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/input_common/gcadapter/gc_poller.cpp b/src/input_common/gcadapter/gc_poller.cpp index 65454cb422..f45983f3f6 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; } } From ac7e4e2cab7d9a953488d6f26350792251c82ffe Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 25 Jul 2020 03:38:22 -0400 Subject: [PATCH 3/3] gc_adapter: Resolve C++20 deprecation warning --- src/input_common/gcadapter/gc_adapter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/input_common/gcadapter/gc_adapter.cpp b/src/input_common/gcadapter/gc_adapter.cpp index 02d06876f2..29ea1f2c78 100644 --- a/src/input_common/gcadapter/gc_adapter.cpp +++ b/src/input_common/gcadapter/gc_adapter.cpp @@ -254,7 +254,7 @@ void Adapter::GetGCEndpoint(libusb_device* device) { sizeof(clear_payload), nullptr, 16); adapter_thread_running = true; - adapter_input_thread = std::thread([=] { Read(); }); // Read input + adapter_input_thread = std::thread(&Adapter::Read, this); } Adapter::~Adapter() {