summaryrefslogtreecommitdiff
path: root/src/input_common
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/input_common/CMakeLists.txt16
-rw-r--r--src/input_common/gcadapter/gc_adapter.cpp7
-rw-r--r--src/input_common/udp/protocol.h7
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)
34 /W4 34 /W4
35 /WX 35 /WX
36 36
37 # 'expression' : signed/unsigned mismatch 37 /we4242 # 'identifier': conversion from 'type1' to 'type2', possible loss of data
38 /we4018 38 /we4244 # 'conversion': conversion from 'type1' to 'type2', possible loss of data
39 # 'argument' : conversion from 'type1' to 'type2', possible loss of data (floating-point) 39 /we4245 # 'conversion': conversion from 'type1' to 'type2', signed/unsigned mismatch
40 /we4244 40 /we4254 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data
41 # 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch
42 /we4245
43 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data
44 /we4254
45 # 'var' : conversion from 'size_t' to 'type', possible loss of data
46 /we4267
47 # 'context' : truncation from 'type1' to 'type2'
48 /we4305
49 ) 41 )
50else() 42else()
51 target_compile_options(input_common PRIVATE 43 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 @@
5#include <chrono> 5#include <chrono>
6#include <thread> 6#include <thread>
7 7
8#ifdef _MSC_VER
9#pragma warning(push)
10#pragma warning(disable : 4200) // nonstandard extension used : zero-sized array in struct/union
11#endif
12#include <libusb.h> 8#include <libusb.h>
13#ifdef _MSC_VER
14#pragma warning(pop)
15#endif
16 9
17#include "common/logging/log.h" 10#include "common/logging/log.h"
18#include "common/param_package.h" 11#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 @@
8#include <optional> 8#include <optional>
9#include <type_traits> 9#include <type_traits>
10 10
11#ifdef _MSC_VER
12#pragma warning(push)
13#pragma warning(disable : 4701)
14#endif
15#include <boost/crc.hpp> 11#include <boost/crc.hpp>
16#ifdef _MSC_VER
17#pragma warning(pop)
18#endif
19 12
20#include "common/bit_field.h" 13#include "common/bit_field.h"
21#include "common/swap.h" 14#include "common/swap.h"