diff options
Diffstat (limited to 'src/input_common')
| -rw-r--r-- | src/input_common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/input_common/input_poller.cpp | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt index 322c29065..5c127c8ef 100644 --- a/src/input_common/CMakeLists.txt +++ b/src/input_common/CMakeLists.txt | |||
| @@ -37,8 +37,6 @@ add_library(input_common STATIC | |||
| 37 | 37 | ||
| 38 | if (MSVC) | 38 | if (MSVC) |
| 39 | target_compile_options(input_common PRIVATE | 39 | target_compile_options(input_common PRIVATE |
| 40 | /W4 | ||
| 41 | |||
| 42 | /we4242 # 'identifier': conversion from 'type1' to 'type2', possible loss of data | 40 | /we4242 # 'identifier': conversion from 'type1' to 'type2', possible loss of data |
| 43 | /we4254 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data | 41 | /we4254 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data |
| 44 | /we4800 # Implicit conversion from 'type' to bool. Possible information loss | 42 | /we4800 # Implicit conversion from 'type' to bool. Possible information loss |
diff --git a/src/input_common/input_poller.cpp b/src/input_common/input_poller.cpp index 870e76ab0..188e862d7 100644 --- a/src/input_common/input_poller.cpp +++ b/src/input_common/input_poller.cpp | |||
| @@ -835,15 +835,15 @@ public: | |||
| 835 | return input_engine->SupportsNfc(identifier); | 835 | return input_engine->SupportsNfc(identifier); |
| 836 | } | 836 | } |
| 837 | 837 | ||
| 838 | Common::Input::NfcState StartNfcPolling() { | 838 | Common::Input::NfcState StartNfcPolling() override { |
| 839 | return input_engine->StartNfcPolling(identifier); | 839 | return input_engine->StartNfcPolling(identifier); |
| 840 | } | 840 | } |
| 841 | 841 | ||
| 842 | Common::Input::NfcState StopNfcPolling() { | 842 | Common::Input::NfcState StopNfcPolling() override { |
| 843 | return input_engine->StopNfcPolling(identifier); | 843 | return input_engine->StopNfcPolling(identifier); |
| 844 | } | 844 | } |
| 845 | 845 | ||
| 846 | Common::Input::NfcState ReadAmiiboData(std::vector<u8>& out_data) { | 846 | Common::Input::NfcState ReadAmiiboData(std::vector<u8>& out_data) override { |
| 847 | return input_engine->ReadAmiiboData(identifier, out_data); | 847 | return input_engine->ReadAmiiboData(identifier, out_data); |
| 848 | } | 848 | } |
| 849 | 849 | ||
| @@ -852,11 +852,11 @@ public: | |||
| 852 | } | 852 | } |
| 853 | 853 | ||
| 854 | Common::Input::NfcState ReadMifareData(const Common::Input::MifareRequest& request, | 854 | Common::Input::NfcState ReadMifareData(const Common::Input::MifareRequest& request, |
| 855 | Common::Input::MifareRequest& out_data) { | 855 | Common::Input::MifareRequest& out_data) override { |
| 856 | return input_engine->ReadMifareData(identifier, request, out_data); | 856 | return input_engine->ReadMifareData(identifier, request, out_data); |
| 857 | } | 857 | } |
| 858 | 858 | ||
| 859 | Common::Input::NfcState WriteMifareData(const Common::Input::MifareRequest& request) { | 859 | Common::Input::NfcState WriteMifareData(const Common::Input::MifareRequest& request) override { |
| 860 | return input_engine->WriteMifareData(identifier, request); | 860 | return input_engine->WriteMifareData(identifier, request); |
| 861 | } | 861 | } |
| 862 | 862 | ||