[cpprestsdk] Fix narrowing and remove werror (#26095)

* cpprestsdk fix narrowing and werror

* v db
This commit is contained in:
Alexander Neumann 2022-08-01 21:12:14 +02:00 committed by GitHub
parent 692304eda9
commit 48e128816e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 61 additions and 3 deletions

View File

@ -0,0 +1,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;

View File

@ -4,7 +4,9 @@ vcpkg_from_github(
REF 122d09549201da5383321d870bed45ecb9e168c5
SHA512 c9ded33d3c67880e2471e479a38b40a14a9ff45d241e928b6339eca697b06ad621846260eca47b6b1b8a2bc9ab7bf4fea8d3e8e795cd430d8839beb530e16dd7
HEAD_REF master
PATCHES fix-find-openssl.patch
PATCHES
fix-find-openssl.patch
fix_narrowing.patch
)
set(OPTIONS)

View File

@ -1,12 +1,13 @@
{
"name": "cpprestsdk",
"version": "2.10.18",
"port-version": 1,
"port-version": 2,
"description": [
"C++11 JSON, REST, and OAuth library",
"The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services."
],
"homepage": "https://github.com/Microsoft/cpprestsdk",
"license": "MIT",
"dependencies": [
{
"name": "boost-asio",

View File

@ -1654,7 +1654,7 @@
},
"cpprestsdk": {
"baseline": "2.10.18",
"port-version": 1
"port-version": 2
},
"cpptoml": {
"baseline": "v0.1.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e1fb46f5d043e3a354bfbc6f77df5df3b321f74b",
"version": "2.10.18",
"port-version": 2
},
{
"git-tree": "b37c56224faff461184f427b95f10dc320d74d50",
"version": "2.10.18",