Skip to content

Commit b221a47

Browse files
stgatesstgates
committed
Updating Windows desktop for VS2015 RC, bumping to Boost 1.58 when targeting Windows.
1 parent 80e7c69 commit b221a47

15 files changed

+84
-78
lines changed

‎Release/include/cpprest/details/x509_cert_utilities.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,14 @@
3030

3131
#if defined(__APPLE__) || (defined(ANDROID) || defined(__ANDROID__)) || (defined(_WIN32) && !defined(__cplusplus_winrt) && !defined(_M_ARM) && !defined(CPPREST_EXCLUDE_WEBSOCKETS))
3232

33+
#if defined(_MSC_VER)
34+
#pragma warning(push)
35+
#pragma warning(disable : 4005)
36+
#endif
3337
#include <boost/asio/ssl.hpp>
38+
#if defined(_MSC_VER)
39+
#pragma warning(pop)
40+
#endif
3441

3542
namespace web { namespace http { namespace client { namespace details {
3643

‎Release/src/build/vs12.xp/casablanca120.xp.vcxproj

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,16 @@
1818
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
1919
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
2020
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Product.Settings" />
21-
<PropertyGroup>
22-
<Linkage-zlib>static</Linkage-zlib>
23-
<Linkage-openssl>static</Linkage-openssl>
24-
</PropertyGroup>
2521
<ImportGroup Label="PropertySheets">
2622
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
27-
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
28-
<Import Project="$(PackagesRoot)\boost_system-vc120.1.55.0.16\build\native\boost_system-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc120.1.55.0.16\build\native\boost_system-vc120.targets')" />
29-
<Import Project="$(PackagesRoot)\boost_date_time-vc120.1.55.0.16\build\native\boost_date_time-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc120.1.55.0.16\build\native\boost_date_time-vc120.targets')" />
30-
<Import Project="$(PackagesRoot)\boost_regex-vc120.1.55.0.16\build\native\boost_regex-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc120.1.55.0.16\build\native\boost_regex-vc120.targets')" />
31-
<Import Project="$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.props" Condition="Exists('$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.props')" />
32-
<Import Project="$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.targets" Condition="Exists('$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.targets')" />
33-
<Import Project="$(PackagesRoot)\zlib.1.2.8.7\build\native\zlib.targets" Condition="Exists('$(PackagesRoot)\zlib.1.2.8.7\build\native\zlib.targets')" />
23+
<Import Project="$(PackagesRoot)\boost.1.58.0\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.58.0\build\native\boost.targets')" />
24+
<Import Project="$(PackagesRoot)\boost_system-vc120.1.58.0\build\native\boost_system-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc120.1.58.0\build\native\boost_system-vc120.targets')" />
25+
<Import Project="$(PackagesRoot)\boost_date_time-vc120.1.58.0\build\native\boost_date_time-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc120.1.58.0\build\native\boost_date_time-vc120.targets')" />
26+
<Import Project="$(PackagesRoot)\boost_regex-vc120.1.58.0\build\native\boost_regex-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc120.1.58.0\build\native\boost_regex-vc120.targets')" />
27+
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets')" />
28+
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets')" />
29+
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.1.0.2.0\build\native\openssl.targets')" />
30+
<Import Project="$(PackagesRoot)\zlib.v120.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('$(PackagesRoot)\zlib.v120.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.targets')" />
3431
</ImportGroup>
3532
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
3633
<DebugFileSuffix>d</DebugFileSuffix>

‎Release/src/build/vs12.xp/packages.config

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="boost" version="1.55.0.16" targetFramework="Native" developmentDependency="true" />
4-
<package id="boost_chrono-vc120" version="1.55.0.16" targetFramework="Native" developmentDependency="true" />
5-
<package id="boost_date_time-vc120" version="1.55.0.16" targetFramework="Native" developmentDependency="true" />
6-
<package id="boost_regex-vc120" version="1.55.0.16" targetFramework="Native" developmentDependency="true" />
7-
<package id="boost_system-vc120" version="1.55.0.16" targetFramework="Native" developmentDependency="true" />
8-
<package id="boost_thread-vc120" version="1.55.0.16" targetFramework="Native" developmentDependency="true" />
9-
<package id="openssl" version="1.0.1.25" targetFramework="Native" developmentDependency="true" />
10-
<package id="zlib" version="1.2.8.7" targetFramework="Native" developmentDependency="true" />
3+
<package id="boost" version="1.58.0" targetFramework="Native" developmentDependency="true" />
4+
<package id="boost_chrono-vc120" version="1.58.0" targetFramework="Native" developmentDependency="true" />
5+
<package id="boost_date_time-vc120" version="1.58.0" targetFramework="Native" developmentDependency="true" />
6+
<package id="boost_regex-vc120" version="1.58.0" targetFramework="Native" developmentDependency="true" />
7+
<package id="boost_system-vc120" version="1.58.0" targetFramework="Native" developmentDependency="true" />
8+
<package id="boost_thread-vc120" version="1.58.0" targetFramework="Native" developmentDependency="true" />
9+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x64" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
10+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x86" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
11+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn" version="1.0.2.0" targetFramework="Native" developmentDependency="true" />
12+
<package id="zlib.v120.windesktop.msvcstl.static.rt-dyn" version="1.2.8.8" targetFramework="Native" developmentDependency="true" />
1113
</packages>

‎Release/src/build/vs12/casablanca120.vcxproj

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,16 @@
1818
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
1919
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
2020
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Product.Settings" />
21-
<PropertyGroup>
22-
<Linkage-zlib>static</Linkage-zlib>
23-
<Linkage-openssl>static</Linkage-openssl>
24-
</PropertyGroup>
2521
<ImportGroup Label="PropertySheets">
2622
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
27-
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
28-
<Import Project="$(PackagesRoot)\boost_system-vc120.1.55.0.16\build\native\boost_system-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc120.1.55.0.16\build\native\boost_system-vc120.targets')" />
29-
<Import Project="$(PackagesRoot)\boost_date_time-vc120.1.55.0.16\build\native\boost_date_time-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc120.1.55.0.16\build\native\boost_date_time-vc120.targets')" />
30-
<Import Project="$(PackagesRoot)\boost_regex-vc120.1.55.0.16\build\native\boost_regex-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc120.1.55.0.16\build\native\boost_regex-vc120.targets')" />
31-
<Import Project="$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.props" Condition="Exists('$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.props')" />
32-
<Import Project="$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.targets" Condition="Exists('$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.targets')" />
33-
<Import Project="$(PackagesRoot)\zlib.1.2.8.7\build\native\zlib.targets" Condition="Exists('$(PackagesRoot)\zlib.1.2.8.7\build\native\zlib.targets')" />
23+
<Import Project="$(PackagesRoot)\boost.1.58.0\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.58.0\build\native\boost.targets')" />
24+
<Import Project="$(PackagesRoot)\boost_system-vc120.1.58.0\build\native\boost_system-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc120.1.58.0\build\native\boost_system-vc120.targets')" />
25+
<Import Project="$(PackagesRoot)\boost_date_time-vc120.1.58.0\build\native\boost_date_time-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc120.1.58.0\build\native\boost_date_time-vc120.targets')" />
26+
<Import Project="$(PackagesRoot)\boost_regex-vc120.1.58.0\build\native\boost_regex-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc120.1.58.16\build\native\boost_regex-vc120.targets')" />
27+
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets')" />
28+
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets')" />
29+
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.1.0.2.0\build\native\openssl.targets')" />
30+
<Import Project="$(PackagesRoot)\zlib.v120.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('$(PackagesRoot)\zlib.v120.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.targets')" />
3431
</ImportGroup>
3532
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
3633
<DebugFileSuffix>d</DebugFileSuffix>

‎Release/src/build/vs12/packages.config

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="boost" version="1.55.0.16" targetFramework="Native" developmentDependency="true" />
4-
<package id="boost_chrono-vc120" version="1.55.0.16" targetFramework="Native" developmentDependency="true" />
5-
<package id="boost_date_time-vc120" version="1.55.0.16" targetFramework="Native" developmentDependency="true" />
6-
<package id="boost_regex-vc120" version="1.55.0.16" targetFramework="Native" developmentDependency="true" />
7-
<package id="boost_system-vc120" version="1.55.0.16" targetFramework="Native" developmentDependency="true" />
8-
<package id="boost_thread-vc120" version="1.55.0.16" targetFramework="Native" developmentDependency="true" />
9-
<package id="openssl" version="1.0.1.25" targetFramework="Native" developmentDependency="true" />
10-
<package id="zlib" version="1.2.8.7" targetFramework="Native" developmentDependency="true" />
3+
<package id="boost" version="1.58.0" targetFramework="Native" developmentDependency="true" />
4+
<package id="boost_chrono-vc120" version="1.58.0" targetFramework="Native" developmentDependency="true" />
5+
<package id="boost_date_time-vc120" version="1.58.0" targetFramework="Native" developmentDependency="true" />
6+
<package id="boost_regex-vc120" version="1.58.0" targetFramework="Native" developmentDependency="true" />
7+
<package id="boost_system-vc120" version="1.58.0" targetFramework="Native" developmentDependency="true" />
8+
<package id="boost_thread-vc120" version="1.58.0" targetFramework="Native" developmentDependency="true" />
9+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x64" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
10+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x86" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
11+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn" version="1.0.2.0" targetFramework="Native" developmentDependency="true" />
12+
<package id="zlib.v120.windesktop.msvcstl.static.rt-dyn" version="1.2.8.8" targetFramework="Native" developmentDependency="true" />
1113
</packages>

‎Release/src/build/vs14/casablanca140.vcxproj

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,16 @@
1818
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
1919
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
2020
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Product.Settings" />
21-
<PropertyGroup>
22-
<Linkage-zlib>static</Linkage-zlib>
23-
<Linkage-openssl>static</Linkage-openssl>
24-
</PropertyGroup>
2521
<ImportGroup Label="PropertySheets">
2622
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
27-
<Import Project="$(PackagesRoot)\boost.1.57.0.0\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.57.0.0\build\native\boost.targets')" />
28-
<Import Project="$(PackagesRoot)\boost_system-vc140.1.57.0-vc140ctp61\build\native\boost_system-vc140.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc140.1.57.0-vc140ctp60\build\native\boost_system-vc140.targets')" />
29-
<Import Project="$(PackagesRoot)\zlib.v140.win32.msvcp.static.md.1.2.8-vc140ctp6\build\native\zlib.v140.win32.msvcp.static.md.targets" Condition="Exists('$(PackagesRoot)\zlib.v140.win32.msvcp.static.md.1.2.8-vc140ctp6\build\native\zlib.v140.win32.msvcp.static.md.targets')" />
30-
<Import Project="$(PackagesRoot)\openssl.v140.win32.msvcp.static.md.1.0.1-vc140ctp6\build\native\openssl.v140.win32.msvcp.static.md.targets" Condition="Exists('$(PackagesRoot)\openssl.v140.win32.msvcp.static.md.1.0.1-vc140ctp6\build\native\openssl.v140.win32.msvcp.static.md.targets')" />
31-
<Import Project="$(PackagesRoot)\boost_date_time-vc140.1.57.0-vc140ctp61\build\native\boost_date_time-vc140.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc140.1.57.0-vc140ctp61\build\native\boost_date_time-vc140.targets')" />
32-
<Import Project="$(PackagesRoot)\boost_regex-vc140.1.57.0-vc140ctp61\build\native\boost_regex-vc140.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc140.1.57.0-vc140ctp61\build\native\boost_regex-vc140.targets')" />
23+
<Import Project="$(PackagesRoot)\boost.1.58.0.0\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.58.0.0\build\native\boost.targets')" />
24+
<Import Project="$(PackagesRoot)\boost_system-vc140.1.58.0-vs140rc\build\native\boost_system-vc140.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc140.1.58.0-vs140rc\build\native\boost_system-vc140.targets')" />
25+
<Import Project="$(PackagesRoot)\zlib.v140.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v140.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('$(PackagesRoot)\zlib.v140.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v140.windesktop.msvcstl.static.rt-dyn.targets')" />
26+
<Import Project="$(PackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.0\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.targets" Condition="Exists('$(PackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.0\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.targets')" />
27+
<Import Project="$(PackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.0\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.x86.targets" Condition="Exists('$(PackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.0\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.x86.targets')" />
28+
<Import Project="$(PackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.1.0.2.0\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('$(PackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.1.0.2.0\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.targets')" />
29+
<Import Project="$(PackagesRoot)\boost_date_time-vc140.1.58.0-vs140rc\build\native\boost_date_time-vc140.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc140.1.58.0-vs140rc\build\native\boost_date_time-vc140.targets')" />
30+
<Import Project="$(PackagesRoot)\boost_regex-vc140.1.58.0-vs140rc\build\native\boost_regex-vc140.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc140.1.58.0-vs140rc\build\native\boost_regex-vc140.targets')" />
3331
</ImportGroup>
3432
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
3533
<DebugFileSuffix>d</DebugFileSuffix>

‎Release/src/build/vs14/packages.config

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="boost" version="1.57.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
4-
<package id="openssl.v140.win32.msvcp.static.md" version="1.0.1-vc140ctp6" targetFramework="native" developmentDependency="true" userInstalled="true" />
5-
<package id="zlib.v140.win32.msvcp.static.md" version="1.2.8-vc140ctp6" targetFramework="native" developmentDependency="true" userInstalled="true" />
3+
<package id="boost" version="1.58.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
4+
<package id="boost_system-vc140" version="1.58.0-vs140rc" targetFramework="native" developmentDependency="true" userInstalled="true" />
5+
<package id="boost_date_time-vc140" version="1.58.0-vs140rc" targetFramework="native" developmentDependency="true" userInstalled="true" />
6+
<package id="boost_regex-vc140" version="1.58.0-vs140rc" targetFramework="native" developmentDependency="true" userInstalled="true" />
7+
<package id="openssl.v140.windesktop.msvcstl.static.rt-dyn" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
8+
<package id="openssl.v140.windesktop.msvcstl.static.rt-dyn.x64" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
9+
<package id="openssl.v140.windesktop.msvcstl.static.rt-dyn.x86" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
10+
<package id="zlib.v140.windesktop.msvcstl.static.rt-dyn" version="1.2.8.8" targetFramework="native" developmentDependency="true" userInstalled="true" />
611
</packages>

‎Release/tests/functional/websockets/utilities/test_websocket_server.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
#ifdef _WIN32
3333
#pragma warning( push )
34-
#pragma warning(disable : 4100 4127 4996 4512 4701 4267 4067 4503)
34+
#pragma warning(disable : 4100 4127 4996 4512 4701 4267 4067 4503 4005)
3535
#if defined(_MSC_VER) && (_MSC_VER >= 1800)
3636
#define _WEBSOCKETPP_CPP11_STL_
3737
#define _WEBSOCKETPP_CONSTEXPR_TOKEN_

0 commit comments

Comments
 (0)