diff options
| -rw-r--r-- | src/core/frontend/input.h | 2 | ||||
| -rw-r--r-- | src/input_common/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/input_common/gcadapter/gc_poller.cpp | 1 | ||||
| -rw-r--r-- | src/input_common/sdl/sdl.h | 2 | ||||
| -rw-r--r-- | src/input_common/sdl/sdl_impl.cpp | 4 | ||||
| -rw-r--r-- | src/input_common/touch_from_button.cpp | 3 | ||||
| -rw-r--r-- | src/input_common/udp/client.cpp | 6 | ||||
| -rw-r--r-- | src/input_common/udp/protocol.h | 11 |
8 files changed, 23 insertions, 10 deletions
diff --git a/src/core/frontend/input.h b/src/core/frontend/input.h index 25ac5af46..95c2848eb 100644 --- a/src/core/frontend/input.h +++ b/src/core/frontend/input.h | |||
| @@ -30,7 +30,7 @@ public: | |||
| 30 | virtual StatusType GetStatus() const { | 30 | virtual StatusType GetStatus() const { |
| 31 | return {}; | 31 | return {}; |
| 32 | } | 32 | } |
| 33 | virtual bool GetAnalogDirectionStatus(AnalogDirection direction) const { | 33 | virtual bool GetAnalogDirectionStatus([[maybe_unused]] AnalogDirection direction) const { |
| 34 | return {}; | 34 | return {}; |
| 35 | } | 35 | } |
| 36 | virtual bool SetRumblePlay(f32 amp_low, f32 freq_low, f32 amp_high, f32 freq_high) const { | 36 | virtual bool SetRumblePlay(f32 amp_low, f32 freq_low, f32 amp_high, f32 freq_high) const { |
diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt index 7b39a38c1..1d1b2e08a 100644 --- a/src/input_common/CMakeLists.txt +++ b/src/input_common/CMakeLists.txt | |||
| @@ -31,6 +31,9 @@ add_library(input_common STATIC | |||
| 31 | 31 | ||
| 32 | if (MSVC) | 32 | if (MSVC) |
| 33 | target_compile_options(input_common PRIVATE | 33 | target_compile_options(input_common PRIVATE |
| 34 | /W4 | ||
| 35 | /WX | ||
| 36 | |||
| 34 | # 'expression' : signed/unsigned mismatch | 37 | # 'expression' : signed/unsigned mismatch |
| 35 | /we4018 | 38 | /we4018 |
| 36 | # 'argument' : conversion from 'type1' to 'type2', possible loss of data (floating-point) | 39 | # 'argument' : conversion from 'type1' to 'type2', possible loss of data (floating-point) |
| @@ -46,6 +49,7 @@ if (MSVC) | |||
| 46 | ) | 49 | ) |
| 47 | else() | 50 | else() |
| 48 | target_compile_options(input_common PRIVATE | 51 | target_compile_options(input_common PRIVATE |
| 52 | -Werror | ||
| 49 | -Werror=conversion | 53 | -Werror=conversion |
| 50 | -Werror=ignored-qualifiers | 54 | -Werror=ignored-qualifiers |
| 51 | -Werror=implicit-fallthrough | 55 | -Werror=implicit-fallthrough |
diff --git a/src/input_common/gcadapter/gc_poller.cpp b/src/input_common/gcadapter/gc_poller.cpp index d95574bb5..4e8c7e8b9 100644 --- a/src/input_common/gcadapter/gc_poller.cpp +++ b/src/input_common/gcadapter/gc_poller.cpp | |||
| @@ -96,7 +96,6 @@ std::unique_ptr<Input::ButtonDevice> GCButtonFactory::Create(const Common::Param | |||
| 96 | adapter.get()); | 96 | adapter.get()); |
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | UNREACHABLE(); | ||
| 100 | return nullptr; | 99 | return nullptr; |
| 101 | } | 100 | } |
| 102 | 101 | ||
diff --git a/src/input_common/sdl/sdl.h b/src/input_common/sdl/sdl.h index f3554be9a..42bbf14d4 100644 --- a/src/input_common/sdl/sdl.h +++ b/src/input_common/sdl/sdl.h | |||
| @@ -23,7 +23,7 @@ public: | |||
| 23 | /// Unregisters SDL device factories and shut them down. | 23 | /// Unregisters SDL device factories and shut them down. |
| 24 | virtual ~State() = default; | 24 | virtual ~State() = default; |
| 25 | 25 | ||
| 26 | virtual Pollers GetPollers(Polling::DeviceType type) { | 26 | virtual Pollers GetPollers(Polling::DeviceType) { |
| 27 | return {}; | 27 | return {}; |
| 28 | } | 28 | } |
| 29 | 29 | ||
diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp index c395d96cf..c16928e98 100644 --- a/src/input_common/sdl/sdl_impl.cpp +++ b/src/input_common/sdl/sdl_impl.cpp | |||
| @@ -864,6 +864,8 @@ Common::ParamPackage SDLEventToMotionParamPackage(SDLState& state, const SDL_Eve | |||
| 864 | Common::ParamPackage BuildParamPackageForBinding(int port, const std::string& guid, | 864 | Common::ParamPackage BuildParamPackageForBinding(int port, const std::string& guid, |
| 865 | const SDL_GameControllerButtonBind& binding) { | 865 | const SDL_GameControllerButtonBind& binding) { |
| 866 | switch (binding.bindType) { | 866 | switch (binding.bindType) { |
| 867 | case SDL_CONTROLLER_BINDTYPE_NONE: | ||
| 868 | break; | ||
| 867 | case SDL_CONTROLLER_BINDTYPE_AXIS: | 869 | case SDL_CONTROLLER_BINDTYPE_AXIS: |
| 868 | return BuildAnalogParamPackageForButton(port, guid, binding.value.axis); | 870 | return BuildAnalogParamPackageForButton(port, guid, binding.value.axis); |
| 869 | case SDL_CONTROLLER_BINDTYPE_BUTTON: | 871 | case SDL_CONTROLLER_BINDTYPE_BUTTON: |
| @@ -984,7 +986,7 @@ class SDLPoller : public InputCommon::Polling::DevicePoller { | |||
| 984 | public: | 986 | public: |
| 985 | explicit SDLPoller(SDLState& state_) : state(state_) {} | 987 | explicit SDLPoller(SDLState& state_) : state(state_) {} |
| 986 | 988 | ||
| 987 | void Start(const std::string& device_id) override { | 989 | void Start([[maybe_unused]] const std::string& device_id) override { |
| 988 | state.event_queue.Clear(); | 990 | state.event_queue.Clear(); |
| 989 | state.polling = true; | 991 | state.polling = true; |
| 990 | } | 992 | } |
diff --git a/src/input_common/touch_from_button.cpp b/src/input_common/touch_from_button.cpp index c37716aae..a07124a86 100644 --- a/src/input_common/touch_from_button.cpp +++ b/src/input_common/touch_from_button.cpp | |||
| @@ -44,8 +44,7 @@ private: | |||
| 44 | std::vector<std::tuple<std::unique_ptr<Input::ButtonDevice>, int, int>> map; | 44 | std::vector<std::tuple<std::unique_ptr<Input::ButtonDevice>, int, int>> map; |
| 45 | }; | 45 | }; |
| 46 | 46 | ||
| 47 | std::unique_ptr<Input::TouchDevice> TouchFromButtonFactory::Create( | 47 | std::unique_ptr<Input::TouchDevice> TouchFromButtonFactory::Create(const Common::ParamPackage&) { |
| 48 | const Common::ParamPackage& params) { | ||
| 49 | return std::make_unique<TouchFromButtonDevice>(); | 48 | return std::make_unique<TouchFromButtonDevice>(); |
| 50 | } | 49 | } |
| 51 | 50 | ||
diff --git a/src/input_common/udp/client.cpp b/src/input_common/udp/client.cpp index 3677e79ca..10b07d338 100644 --- a/src/input_common/udp/client.cpp +++ b/src/input_common/udp/client.cpp | |||
| @@ -63,7 +63,7 @@ public: | |||
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | private: | 65 | private: |
| 66 | void HandleReceive(const boost::system::error_code& error, std::size_t bytes_transferred) { | 66 | void HandleReceive(const boost::system::error_code&, std::size_t bytes_transferred) { |
| 67 | if (auto type = Response::Validate(receive_buffer.data(), bytes_transferred)) { | 67 | if (auto type = Response::Validate(receive_buffer.data(), bytes_transferred)) { |
| 68 | switch (*type) { | 68 | switch (*type) { |
| 69 | case Type::Version: { | 69 | case Type::Version: { |
| @@ -90,7 +90,7 @@ private: | |||
| 90 | StartReceive(); | 90 | StartReceive(); |
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | void HandleSend(const boost::system::error_code& error) { | 93 | void HandleSend(const boost::system::error_code&) { |
| 94 | boost::system::error_code _ignored{}; | 94 | boost::system::error_code _ignored{}; |
| 95 | // Send a request for getting port info for the pad | 95 | // Send a request for getting port info for the pad |
| 96 | const Request::PortInfo port_info{1, {static_cast<u8>(pad_index), 0, 0, 0}}; | 96 | const Request::PortInfo port_info{1, {static_cast<u8>(pad_index), 0, 0, 0}}; |
| @@ -369,7 +369,7 @@ CalibrationConfigurationJob::CalibrationConfigurationJob( | |||
| 369 | u16 max_y{}; | 369 | u16 max_y{}; |
| 370 | 370 | ||
| 371 | Status current_status{Status::Initialized}; | 371 | Status current_status{Status::Initialized}; |
| 372 | SocketCallback callback{[](Response::Version version) {}, [](Response::PortInfo info) {}, | 372 | SocketCallback callback{[](Response::Version) {}, [](Response::PortInfo) {}, |
| 373 | [&](Response::PadData data) { | 373 | [&](Response::PadData data) { |
| 374 | if (current_status == Status::Initialized) { | 374 | if (current_status == Status::Initialized) { |
| 375 | // Receiving data means the communication is ready now | 375 | // Receiving data means the communication is ready now |
diff --git a/src/input_common/udp/protocol.h b/src/input_common/udp/protocol.h index 3ba4d1fc8..fc1aea4b9 100644 --- a/src/input_common/udp/protocol.h +++ b/src/input_common/udp/protocol.h | |||
| @@ -7,7 +7,16 @@ | |||
| 7 | #include <array> | 7 | #include <array> |
| 8 | #include <optional> | 8 | #include <optional> |
| 9 | #include <type_traits> | 9 | #include <type_traits> |
| 10 | |||
| 11 | #ifdef _MSC_VER | ||
| 12 | #pragma warning(push) | ||
| 13 | #pragma warning(disable : 4701) | ||
| 14 | #endif | ||
| 10 | #include <boost/crc.hpp> | 15 | #include <boost/crc.hpp> |
| 16 | #ifdef _MSC_VER | ||
| 17 | #pragma warning(pop) | ||
| 18 | #endif | ||
| 19 | |||
| 11 | #include "common/bit_field.h" | 20 | #include "common/bit_field.h" |
| 12 | #include "common/swap.h" | 21 | #include "common/swap.h" |
| 13 | 22 | ||
| @@ -93,7 +102,7 @@ static_assert(std::is_trivially_copyable_v<PadData>, | |||
| 93 | 102 | ||
| 94 | /** | 103 | /** |
| 95 | * Creates a message with the proper header data that can be sent to the server. | 104 | * Creates a message with the proper header data that can be sent to the server. |
| 96 | * @param T data Request body to send | 105 | * @param data Request body to send |
| 97 | * @param client_id ID of the udp client (usually not checked on the server) | 106 | * @param client_id ID of the udp client (usually not checked on the server) |
| 98 | */ | 107 | */ |
| 99 | template <typename T> | 108 | template <typename T> |