blob: 975a759ca96e0c7c575a3770bd831d66ace93c34 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
diff --git a/Release/src/CMakeLists.txt b/Release/src/CMakeLists.txt
index e15aeb7fc..128f6d6af 100644
--- a/Release/src/CMakeLists.txt
+++ b/Release/src/CMakeLists.txt
@@ -185,12 +185,12 @@ endif()
configure_pch(cpprest stdafx.h pch/stdafx.cpp /Zm120)
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND NOT MSVC)
if(WERROR)
target_compile_options(cpprest PRIVATE -Werror)
endif()
target_compile_options(cpprest PRIVATE -pedantic ${WARNINGS})
-elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC" OR CMAKE_CXX_COMPILER_FRONTEND_VARIANT MATCHES "MSVC")
if(WERROR)
target_compile_options(cpprest PRIVATE /WX ${WARNINGS})
endif()
diff --git a/Release/src/streams/fileio_win32.cpp b/Release/src/streams/fileio_win32.cpp
index 057dd9b67..a65439cb7 100644
--- a/Release/src/streams/fileio_win32.cpp
+++ b/Release/src/streams/fileio_win32.cpp
@@ -616,7 +616,7 @@ size_t _fill_buffer_fsb(_In_ _file_info_impl* fInfo,
// pending
return read;
- case (-1):
+ case ((size_t)(-1)):
// error
delete cb;
return read;
@@ -668,7 +668,7 @@ size_t _fill_buffer_fsb(_In_ _file_info_impl* fInfo,
// pending
return read;
- case (-1):
+ case ((size_t)(-1)):
// error
delete cb;
return read;
@@ -719,7 +719,7 @@ size_t _fill_buffer_fsb(_In_ _file_info_impl* fInfo,
// pending
return read;
- case (-1):
+ case ((size_t)(-1)):
// error
delete cb;
return read;
|
