Skip to content

Commit d133746

Browse files
kavyakokavyako
committed
Some fixes to build with clang 3_8.
Ignore the -Winfinite-recursion warning. This has been fixed in the next boost versions.
1 parent 2902b29 commit d133746

File tree

8 files changed

+51
-27
lines changed

8 files changed

+51
-27
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#if defined(__clang__)
2121
#pragma clang diagnostic push
2222
#pragma clang diagnostic ignored "-Wconversion"
23+
#pragma clang diagnostic ignored "-Winfinite-recursion"
2324
#endif
2425
#include <boost/asio.hpp>
2526
#include <boost/asio/ssl.hpp>

‎Release/include/pplx/threadpool.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#pragma clang diagnostic push
3131
#pragma clang diagnostic ignored "-Wconversion"
3232
#pragma clang diagnostic ignored "-Wunreachable-code"
33+
#pragma clang diagnostic ignored "-Winfinite-recursion"
3334
#endif
3435
#include "boost/asio.hpp"
3536
#if defined(__clang__)

‎Release/src/http/client/http_client_asio.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#if defined(__clang__)
3131
#pragma clang diagnostic push
3232
#pragma clang diagnostic ignored "-Wunused-local-typedef"
33+
#pragma clang diagnostic ignored "-Winfinite-recursion"
3334
#endif
3435
#include <boost/asio.hpp>
3536
#include <boost/asio/ssl.hpp>

‎Release/src/pch/stdafx.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#if defined(__clang__)
2929
#pragma clang diagnostic push
3030
#pragma clang diagnostic ignored "-Wunused-local-typedef"
31+
#pragma clang diagnostic ignored "-Winfinite-recursion"
3132
#endif
3233

3334
#include "cpprest/details/cpprest_compat.h"

‎Release/tests/common/TestRunner/vs14.android/TestRunner.android.NativeActivity/TestRunner.android.NativeActivity.vcxproj‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|ARM">
55
<Configuration>Debug</Configuration>
@@ -26,28 +26,32 @@
2626
<DefaultLanguage>en-US</DefaultLanguage>
2727
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
2828
<ApplicationType>Android</ApplicationType>
29-
<ApplicationTypeRevision>1.0</ApplicationTypeRevision>
29+
<ApplicationTypeRevision>2.0</ApplicationTypeRevision>
3030
</PropertyGroup>
3131
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3232
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
3333
<ConfigurationType>DynamicLibrary</ConfigurationType>
3434
<UseDebugLibraries>true</UseDebugLibraries>
3535
<UseOfStl>gnustl_static</UseOfStl>
36+
<PlatformToolset>Clang_3_8</PlatformToolset>
3637
</PropertyGroup>
3738
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
3839
<ConfigurationType>DynamicLibrary</ConfigurationType>
3940
<UseDebugLibraries>true</UseDebugLibraries>
4041
<UseOfStl>gnustl_static</UseOfStl>
42+
<PlatformToolset>Clang_3_8</PlatformToolset>
4143
</PropertyGroup>
4244
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
4345
<ConfigurationType>DynamicLibrary</ConfigurationType>
4446
<UseDebugLibraries>false</UseDebugLibraries>
4547
<UseOfStl>gnustl_static</UseOfStl>
48+
<PlatformToolset>Clang_3_8</PlatformToolset>
4649
</PropertyGroup>
4750
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
4851
<ConfigurationType>DynamicLibrary</ConfigurationType>
4952
<UseDebugLibraries>false</UseDebugLibraries>
5053
<UseOfStl>gnustl_static</UseOfStl>
54+
<PlatformToolset>Clang_3_8</PlatformToolset>
5155
</PropertyGroup>
5256
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5357
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
@@ -253,28 +257,28 @@
253257
</ItemGroup>
254258
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
255259
<ImportGroup Label="ExtensionTargets">
256-
<Import Project="$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets" Condition="Exists('$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets')" />
260+
<Import Project="$(PackagesRoot)\openssl-android.1.0.2.1\build\native\openssl-android.targets" Condition="Exists('$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets')" />
257261
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
258-
<Import Project="$(PackagesRoot)\boost_atomic-android.1.55.0.1\build\native\boost_atomic-android.targets" Condition="Exists('$(PackagesRoot)\boost_atomic-android.1.55.0.1\build\native\boost_atomic-android.targets')" />
259-
<Import Project="$(PackagesRoot)\boost_thread-android.1.55.0.1\build\native\boost_thread-android.targets" Condition="Exists('$(PackagesRoot)\boost_thread-android.1.55.0.1\build\native\boost_thread-android.targets')" />
260-
<Import Project="$(PackagesRoot)\boost_system-android.1.55.0.1\build\native\boost_system-android.targets" Condition="Exists('$(PackagesRoot)\boost_system-android.1.55.0.1\build\native\boost_system-android.targets')" />
261-
<Import Project="$(PackagesRoot)\boost_random-android.1.55.0.1\build\native\boost_random-android.targets" Condition="Exists('$(PackagesRoot)\boost_random-android.1.55.0.1\build\native\boost_random-android.targets')" />
262-
<Import Project="$(PackagesRoot)\boost_filesystem-android.1.55.0.1\build\native\boost_filesystem-android.targets" Condition="Exists('$(PackagesRoot)\boost_filesystem-android.1.55.0.1\build\native\boost_filesystem-android.targets')" />
263-
<Import Project="$(PackagesRoot)\boost_date_time-android.1.55.0.1\build\native\boost_date_time-android.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-android.1.55.0.1\build\native\boost_date_time-android.targets')" />
264-
<Import Project="$(PackagesRoot)\boost_chrono-android.1.55.0.1\build\native\boost_chrono-android.targets" Condition="Exists('$(PackagesRoot)\boost_chrono-android.1.55.0.1\build\native\boost_chrono-android.targets')" />
262+
<Import Project="$(PackagesRoot)\boost_atomic-android.1.55.0.2\build\native\boost_atomic-android.targets" Condition="Exists('$(PackagesRoot)\boost_atomic-android.1.55.0.2\build\native\boost_atomic-android.targets')" />
263+
<Import Project="$(PackagesRoot)\boost_thread-android.1.55.0.2\build\native\boost_thread-android.targets" Condition="Exists('$(PackagesRoot)\boost_thread-android.1.55.0.2\build\native\boost_thread-android.targets')" />
264+
<Import Project="$(PackagesRoot)\boost_system-android.1.55.0.2\build\native\boost_system-android.targets" Condition="Exists('$(PackagesRoot)\boost_system-android.1.55.0.2\build\native\boost_system-android.targets')" />
265+
<Import Project="$(PackagesRoot)\boost_random-android.1.55.0.2\build\native\boost_random-android.targets" Condition="Exists('$(PackagesRoot)\boost_random-android.1.55.0.2\build\native\boost_random-android.targets')" />
266+
<Import Project="$(PackagesRoot)\boost_filesystem-android.1.55.0.2\build\native\boost_filesystem-android.targets" Condition="Exists('$(PackagesRoot)\boost_filesystem-android.1.55.0.2\build\native\boost_filesystem-android.targets')" />
267+
<Import Project="$(PackagesRoot)\boost_date_time-android.1.55.0.2\build\native\boost_date_time-android.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-android.1.55.0.2\build\native\boost_date_time-android.targets')" />
268+
<Import Project="$(PackagesRoot)\boost_chrono-android.1.55.0.2\build\native\boost_chrono-android.targets" Condition="Exists('$(PackagesRoot)\boost_chrono-android.1.55.0.2\build\native\boost_chrono-android.targets')" />
265269
</ImportGroup>
266270
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
267271
<PropertyGroup>
268272
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
269273
</PropertyGroup>
270-
<Error Condition="!Exists('$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets'))" />
274+
<Error Condition="!Exists('$(PackagesRoot)\openssl-android.1.0.2.1\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets'))" />
271275
<Error Condition="!Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets'))" />
272-
<Error Condition="!Exists('$(PackagesRoot)\boost_atomic-android.1.55.0.1\build\native\boost_atomic-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_atomic-android.1.55.0.1\build\native\boost_atomic-android.targets'))" />
273-
<Error Condition="!Exists('$(PackagesRoot)\boost_thread-android.1.55.0.1\build\native\boost_thread-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_thread-android.1.55.0.1\build\native\boost_thread-android.targets'))" />
274-
<Error Condition="!Exists('$(PackagesRoot)\boost_system-android.1.55.0.1\build\native\boost_system-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_system-android.1.55.0.1\build\native\boost_system-android.targets'))" />
275-
<Error Condition="!Exists('$(PackagesRoot)\boost_random-android.1.55.0.1\build\native\boost_random-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_random-android.1.55.0.1\build\native\boost_random-android.targets'))" />
276-
<Error Condition="!Exists('$(PackagesRoot)\boost_filesystem-android.1.55.0.1\build\native\boost_filesystem-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_filesystem-android.1.55.0.1\build\native\boost_filesystem-android.targets'))" />
277-
<Error Condition="!Exists('$(PackagesRoot)\boost_date_time-android.1.55.0.1\build\native\boost_date_time-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_date_time-android.1.55.0.1\build\native\boost_date_time-android.targets'))" />
278-
<Error Condition="!Exists('$(PackagesRoot)\boost_chrono-android.1.55.0.1\build\native\boost_chrono-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_chrono-android.1.55.0.1\build\native\boost_chrono-android.targets'))" />
276+
<Error Condition="!Exists('$(PackagesRoot)\boost_atomic-android.1.55.0.2\build\native\boost_atomic-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_atomic-android.1.55.0.2\build\native\boost_atomic-android.targets'))" />
277+
<Error Condition="!Exists('$(PackagesRoot)\boost_thread-android.1.55.0.2\build\native\boost_thread-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_thread-android.1.55.0.2\build\native\boost_thread-android.targets'))" />
278+
<Error Condition="!Exists('$(PackagesRoot)\boost_system-android.1.55.0.2\build\native\boost_system-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_system-android.1.55.0.2\build\native\boost_system-android.targets'))" />
279+
<Error Condition="!Exists('$(PackagesRoot)\boost_random-android.1.55.0.2\build\native\boost_random-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_random-android.1.55.0.2\build\native\boost_random-android.targets'))" />
280+
<Error Condition="!Exists('$(PackagesRoot)\boost_filesystem-android.1.55.0.2\build\native\boost_filesystem-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_filesystem-android.1.55.0.2\build\native\boost_filesystem-android.targets'))" />
281+
<Error Condition="!Exists('$(PackagesRoot)\boost_date_time-android.1.55.0.2\build\native\boost_date_time-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_date_time-android.1.55.0.2\build\native\boost_date_time-android.targets'))" />
282+
<Error Condition="!Exists('$(PackagesRoot)\boost_chrono-android.1.55.0.2\build\native\boost_chrono-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_chrono-android.1.55.0.2\build\native\boost_chrono-android.targets'))" />
279283
</Target>
280-
</Project>
284+
</Project>

‎Release/tests/common/TestRunner/vs14.android/TestRunner.android.NativeActivity/packages.config‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="boost" version="1.55.0.16" targetFramework="native" />
4-
<package id="boost_atomic-android" version="1.55.0.1" targetFramework="native" />
5-
<package id="boost_chrono-android" version="1.55.0.1" targetFramework="native" />
6-
<package id="boost_date_time-android" version="1.55.0.1" targetFramework="native" />
7-
<package id="boost_filesystem-android" version="1.55.0.1" targetFramework="native" />
8-
<package id="boost_random-android" version="1.55.0.1" targetFramework="native" />
9-
<package id="boost_system-android" version="1.55.0.1" targetFramework="native" />
10-
<package id="boost_thread-android" version="1.55.0.1" targetFramework="native" />
11-
<package id="openssl-android" version="1.0.2.0" targetFramework="native" />
4+
<package id="boost_atomic-android" version="1.55.0.2" targetFramework="native" />
5+
<package id="boost_chrono-android" version="1.55.0.2" targetFramework="native" />
6+
<package id="boost_date_time-android" version="1.55.0.2" targetFramework="native" />
7+
<package id="boost_filesystem-android" version="1.55.0.2" targetFramework="native" />
8+
<package id="boost_random-android" version="1.55.0.2" targetFramework="native" />
9+
<package id="boost_system-android" version="1.55.0.2" targetFramework="native" />
10+
<package id="boost_thread-android" version="1.55.0.2" targetFramework="native" />
11+
<package id="openssl-android" version="1.0.2.1" targetFramework="native" />
1212
</packages>

‎Release/tests/functional/http/client/authentication_tests.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,15 @@
3838
#endif
3939

4040
#if !defined(_WIN32)
41+
#if defined(__clang__)
42+
#pragma clang diagnostic push
43+
#pragma clang diagnostic ignored "-Winfinite-recursion"
44+
#endif
4145
#include <boost/asio.hpp>
4246
#include <boost/asio/ssl.hpp>
47+
#if defined(__clang__)
48+
#pragma clang diagnostic pop
49+
#endif
4350
#endif
4451

4552
using namespace web;

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,18 @@
3939
#endif
4040
#endif /* _WIN32 */
4141

42+
#if defined(__clang__)
43+
#pragma clang diagnostic push
44+
#pragma clang diagnostic ignored "-Winfinite-recursion"
45+
#endif
46+
4247
#include <websocketpp/config/asio_no_tls.hpp>
4348
#include <websocketpp/server.hpp>
4449

50+
#if defined(__clang__)
51+
#pragma clang diagnostic pop
52+
#endif
53+
4554
#ifdef _WIN32
4655
#pragma warning( pop )
4756
#endif

0 commit comments

Comments
 (0)