diff options
| author | bunnei <bunneidev@gmail.com> | 2021-07-06 02:09:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-06 02:09:23 +0200 |
| commit | bf50345d4c13e34e69af0070632400b3472a1a11 (patch) | |
| tree | 1af5586d2d416c1a347ea0bfabed30a3a56d51e0 /src/input_common | |
| parent | Merge pull request #6556 from Morph1984/default-mii (diff) | |
| parent | CMakeLists: Disable all warnings for external headers (diff) | |
| download | yuzu-bf50345d4c13e34e69af0070632400b3472a1a11.tar yuzu-bf50345d4c13e34e69af0070632400b3472a1a11.tar.gz yuzu-bf50345d4c13e34e69af0070632400b3472a1a11.tar.bz2 yuzu-bf50345d4c13e34e69af0070632400b3472a1a11.tar.lz yuzu-bf50345d4c13e34e69af0070632400b3472a1a11.tar.xz yuzu-bf50345d4c13e34e69af0070632400b3472a1a11.tar.zst yuzu-bf50345d4c13e34e69af0070632400b3472a1a11.zip | |
Diffstat (limited to 'src/input_common')
| -rw-r--r-- | src/input_common/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | src/input_common/gcadapter/gc_adapter.cpp | 7 | ||||
| -rw-r--r-- | src/input_common/udp/protocol.h | 7 |
3 files changed, 4 insertions, 26 deletions
diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt index 7c5763f9c..c3423c815 100644 --- a/src/input_common/CMakeLists.txt +++ b/src/input_common/CMakeLists.txt @@ -34,18 +34,10 @@ if (MSVC) /W4 /WX - # 'expression' : signed/unsigned mismatch - /we4018 - # 'argument' : conversion from 'type1' to 'type2', possible loss of data (floating-point) - /we4244 - # 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch - /we4245 - # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data - /we4254 - # 'var' : conversion from 'size_t' to 'type', possible loss of data - /we4267 - # 'context' : truncation from 'type1' to 'type2' - /we4305 + /we4242 # 'identifier': conversion from 'type1' to 'type2', possible loss of data + /we4244 # 'conversion': conversion from 'type1' to 'type2', possible loss of data + /we4245 # 'conversion': conversion from 'type1' to 'type2', signed/unsigned mismatch + /we4254 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data ) else() target_compile_options(input_common PRIVATE diff --git a/src/input_common/gcadapter/gc_adapter.cpp b/src/input_common/gcadapter/gc_adapter.cpp index 320f51ee6..a2f1bb67c 100644 --- a/src/input_common/gcadapter/gc_adapter.cpp +++ b/src/input_common/gcadapter/gc_adapter.cpp @@ -5,14 +5,7 @@ #include <chrono> #include <thread> -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable : 4200) // nonstandard extension used : zero-sized array in struct/union -#endif #include <libusb.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif #include "common/logging/log.h" #include "common/param_package.h" diff --git a/src/input_common/udp/protocol.h b/src/input_common/udp/protocol.h index a3d276697..1bdc9209e 100644 --- a/src/input_common/udp/protocol.h +++ b/src/input_common/udp/protocol.h @@ -8,14 +8,7 @@ #include <optional> #include <type_traits> -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable : 4701) -#endif #include <boost/crc.hpp> -#ifdef _MSC_VER -#pragma warning(pop) -#endif #include "common/bit_field.h" #include "common/swap.h" |