Skip to content

Commit 9aed8c3

Browse files
kavyakokavyako
committed
Merge branch 'clang38' into development
2 parents edfb941 + c873d63 commit 9aed8c3

File tree

28 files changed

+226
-163
lines changed

28 files changed

+226
-163
lines changed

‎Build_android/boost-for-android-x86.patch

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,22 @@
11
diff --git a/build-android.sh b/build-android.sh
2-
index 40453f7..7ffc050 100755
2+
index 40453f7..5902fe2 100755
33
--- a/build-android.sh
44
+++ b/build-android.sh
5-
@@ -258,9 +258,14 @@ case "$NDK_RN" in
5+
@@ -195,8 +195,12 @@ case "$HOST_OS" in
6+
PlatformOS=linux
7+
esac
8+
9+
+NDK_SOURCE_PROPERTIES=$AndroidNDKRoot"/source.properties"
10+
NDK_RELEASE_FILE=$AndroidNDKRoot"/RELEASE.TXT"
11+
-if [ -f "${NDK_RELEASE_FILE}" ]; then
12+
+if [ -f "${NDK_SOURCE_PROPERTIES}" ]; then
13+
+ version=$(grep -i '^Pkg.Revision =' $NDK_SOURCE_PROPERTIES | cut -f2- -d=)
14+
+ NDK_RN=$(echo $version | awk -F. '{print $1}')
15+
+elif [ -f "${NDK_RELEASE_FILE}" ]; then
16+
NDK_RN=`cat $NDK_RELEASE_FILE | sed 's/^r\(.*\)$/\1/g'`
17+
elif [ -n "${AndroidSourcesDetected}" ]; then
18+
if [ -f "${ANDROID_BUILD_TOP}/ndk/docs/CHANGES.html" ]; then
19+
@@ -258,10 +262,20 @@ case "$NDK_RN" in
620
TOOLSET=gcc-androidR8e
721
;;
822
"10 (64-bit)")
@@ -18,17 +32,23 @@ index 40453f7..7ffc050 100755
1832
+ CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/clang++
1933
+ TOOLSET=clang-androidR8e
2034
;;
35+
+ 11)
36+
+ TOOLCHAIN=llvm
37+
+ CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/clang++
38+
+ TOOLSET=clang-androidR8e
39+
+ ;;
2140
*)
2241
echo "Undefined or not supported Android NDK version!"
23-
@@ -391,6 +396,7 @@ echo "Building boost for android"
42+
exit 1
43+
@@ -391,6 +405,7 @@ echo "Building boost for android"
2444
export AndroidBinariesPath=`dirname $CXXPATH`
2545
export PATH=$AndroidBinariesPath:$PATH
2646
export AndroidNDKRoot
2747
+ export PlatformOS
2848
export NO_BZIP2=1
29-
49+
3050
cxxflags=""
31-
@@ -405,7 +411,7 @@ echo "Building boost for android"
51+
@@ -405,7 +420,7 @@ echo "Building boost for android"
3252
--layout=versioned \
3353
--prefix="./../$BUILD_DIR/" \
3454
$LIBRARIES \
@@ -38,11 +58,11 @@ index 40453f7..7ffc050 100755
3858
} | tee -a $PROGDIR/build.log
3959

4060
diff --git a/configs/user-config-boost-1_55_0.jam b/configs/user-config-boost-1_55_0.jam
41-
index 666d4c8..4cd3441 100644
61+
index 666d4c8..93aba68 100644
4262
--- a/configs/user-config-boost-1_55_0.jam
4363
+++ b/configs/user-config-boost-1_55_0.jam
4464
@@ -39,93 +39,47 @@
45-
65+
4666
import os ;
4767
local AndroidNDKRoot = [ os.environ AndroidNDKRoot ] ;
4868
+local PlatformOS = [ os.environ PlatformOS ] ;
@@ -53,10 +73,10 @@ index 666d4c8..4cd3441 100644
5373
+using clang : androidR8e
5474
:
5575
-arm-linux-androideabi-g++
56-
+$(AndroidNDKRoot)/toolchains/llvm-3.6/prebuilt/$(PlatformOS)-x86_64/bin/clang++
76+
+$(AndroidNDKRoot)/toolchains/llvm/prebuilt/$(PlatformOS)-x86_64/bin/clang++
5777
:
5878
-<archiver>arm-linux-androideabi-ar
59-
+<compileflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/x86-4.8/prebuilt/$(PlatformOS)-x86_64"
79+
+<compileflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/x86-4.9/prebuilt/$(PlatformOS)-x86_64"
6080
<compileflags>-fexceptions
6181
<compileflags>-frtti
6282
<compileflags>-fpic
@@ -89,10 +109,10 @@ index 666d4c8..4cd3441 100644
89109
<compileflags>-g
90110
-<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.6/include
91111
-<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi/include
92-
+<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.8/include
93-
+<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86/include
112+
+<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.9/include
113+
+<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include
94114
+<linkflags>--target=i686-none-linux-android
95-
+<linkflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/x86-4.8/prebuilt/$(PlatformOS)-x86_64"
115+
+<linkflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/x86-4.9/prebuilt/$(PlatformOS)-x86_64"
96116
+<linkflags>--sysroot=$(AndroidNDKRoot)/platforms/android-9/arch-x86
97117
# @Moss - Above are the 'oficial' android flags
98118
-<architecture>arm

‎Build_android/boost-for-android.patch

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,22 @@
11
diff --git a/build-android.sh b/build-android.sh
2-
index 40453f7..ad78ddf 100755
2+
index 40453f7..5902fe2 100755
33
--- a/build-android.sh
44
+++ b/build-android.sh
5-
@@ -258,9 +258,14 @@ case "$NDK_RN" in
5+
@@ -195,8 +195,12 @@ case "$HOST_OS" in
6+
PlatformOS=linux
7+
esac
8+
9+
+NDK_SOURCE_PROPERTIES=$AndroidNDKRoot"/source.properties"
10+
NDK_RELEASE_FILE=$AndroidNDKRoot"/RELEASE.TXT"
11+
-if [ -f "${NDK_RELEASE_FILE}" ]; then
12+
+if [ -f "${NDK_SOURCE_PROPERTIES}" ]; then
13+
+ version=$(grep -i '^Pkg.Revision =' $NDK_SOURCE_PROPERTIES | cut -f2- -d=)
14+
+ NDK_RN=$(echo $version | awk -F. '{print $1}')
15+
+elif [ -f "${NDK_RELEASE_FILE}" ]; then
16+
NDK_RN=`cat $NDK_RELEASE_FILE | sed 's/^r\(.*\)$/\1/g'`
17+
elif [ -n "${AndroidSourcesDetected}" ]; then
18+
if [ -f "${ANDROID_BUILD_TOP}/ndk/docs/CHANGES.html" ]; then
19+
@@ -258,10 +262,20 @@ case "$NDK_RN" in
620
TOOLSET=gcc-androidR8e
721
;;
822
"10 (64-bit)")
@@ -18,18 +32,23 @@ index 40453f7..ad78ddf 100755
1832
+ CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/clang++
1933
+ TOOLSET=clang-androidR8e
2034
;;
35+
+ 11)
36+
+ TOOLCHAIN=llvm
37+
+ CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/clang++
38+
+ TOOLSET=clang-androidR8e
39+
+ ;;
2140
*)
2241
echo "Undefined or not supported Android NDK version!"
23-
@@ -391,6 +396,7 @@ echo "Building boost for android"
42+
exit 1
43+
@@ -391,6 +405,7 @@ echo "Building boost for android"
2444
export AndroidBinariesPath=`dirname $CXXPATH`
2545
export PATH=$AndroidBinariesPath:$PATH
2646
export AndroidNDKRoot
2747
+ export PlatformOS
2848
export NO_BZIP2=1
29-
49+
3050
cxxflags=""
31-
@@ -405,7 +411,7 @@ echo "Building boost for android"
32-
threading=multi \
51+
@@ -405,7 +420,7 @@ echo "Building boost for android"
3352
--layout=versioned \
3453
--prefix="./../$BUILD_DIR/" \
3554
$LIBRARIES \
@@ -39,25 +58,25 @@ index 40453f7..ad78ddf 100755
3958
} | tee -a $PROGDIR/build.log
4059

4160
diff --git a/configs/user-config-boost-1_55_0.jam b/configs/user-config-boost-1_55_0.jam
42-
index 666d4c8..df597f6 100644
61+
index 666d4c8..cdab118 100644
4362
--- a/configs/user-config-boost-1_55_0.jam
4463
+++ b/configs/user-config-boost-1_55_0.jam
4564
@@ -39,84 +39,44 @@
46-
65+
4766
import os ;
4867
local AndroidNDKRoot = [ os.environ AndroidNDKRoot ] ;
4968
+local PlatformOS = [ os.environ PlatformOS ] ;
50-
69+
5170
# --------------------------------------------------------------------
5271
-# Is same for 8b, 8c and 8d
5372
-using gcc : androidR8b
5473
+using clang : androidR8e
5574
:
5675
-arm-linux-androideabi-g++
57-
+$(AndroidNDKRoot)/toolchains/llvm-3.6/prebuilt/$(PlatformOS)-x86_64/bin/clang++
76+
+$(AndroidNDKRoot)/toolchains/llvm/prebuilt/$(PlatformOS)-x86_64/bin/clang++
5877
:
5978
-<archiver>arm-linux-androideabi-ar
60-
+<compileflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/arm-linux-androideabi-4.8/prebuilt/$(PlatformOS)-x86_64"
79+
+<compileflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/arm-linux-androideabi-4.9/prebuilt/$(PlatformOS)-x86_64"
6180
<compileflags>-fexceptions
6281
<compileflags>-frtti
6382
<compileflags>-fpic
@@ -134,15 +153,15 @@ index 666d4c8..df597f6 100644
134153
<compileflags>-g
135154
-<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.6/include
136155
-<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi/include
137-
+<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.8/include
138-
+<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi/include
156+
+<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.9/include
157+
+<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include
139158
+<linkflags>--target=armv7-none-linux-androideabi
140-
+<linkflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/arm-linux-androideabi-4.8/prebuilt/$(PlatformOS)-x86_64"
159+
+<linkflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/arm-linux-androideabi-4.9/prebuilt/$(PlatformOS)-x86_64"
141160
+<linkflags>--sysroot=$(AndroidNDKRoot)/platforms/android-9/arch-arm
142161
# @Moss - Above are the 'oficial' android flags
143162
<architecture>arm
144163
<compileflags>-fvisibility=hidden
145-
@@ -125,9 +84,11 @@ arm-linux-androideabi-g++
164+
@@ -125,9 +85,11 @@ arm-linux-androideabi-g++
146165
<cxxflags>-D__arm__
147166
<cxxflags>-D_REENTRANT
148167
<cxxflags>-D_GLIBCXX__PTHREADS

‎Build_android/configure.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ then
193193
cmake "$DIR/../Release/" \
194194
-DCMAKE_TOOLCHAIN_FILE=../android-cmake/android.toolchain.cmake \
195195
-DANDROID_ABI=armeabi-v7a \
196-
-DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.6 \
196+
-DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.8 \
197197
-DANDROID_STL=none \
198198
-DANDROID_STL_FORCE_FEATURES=ON \
199199
-DANDROID_NATIVE_API_LEVEL=android-9 \
@@ -209,7 +209,7 @@ then
209209
cmake "$DIR/../Release/" \
210210
-DCMAKE_TOOLCHAIN_FILE=../android-cmake/android.toolchain.cmake \
211211
-DANDROID_ABI=armeabi-v7a \
212-
-DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.6 \
212+
-DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.8 \
213213
-DANDROID_STL=none \
214214
-DANDROID_STL_FORCE_FEATURES=ON \
215215
-DANDROID_NDK="${ANDROID_NDK}" \
@@ -225,7 +225,7 @@ then
225225
cmake "$DIR/../Release/" \
226226
-DCMAKE_TOOLCHAIN_FILE=../android-cmake/android.toolchain.cmake \
227227
-DANDROID_ABI=x86 \
228-
-DANDROID_TOOLCHAIN_NAME=x86-clang3.6 \
228+
-DANDROID_TOOLCHAIN_NAME=x86-clang3.8 \
229229
-DANDROID_STL=none \
230230
-DANDROID_STL_FORCE_FEATURES=ON \
231231
-DANDROID_NATIVE_API_LEVEL=android-9 \
@@ -241,7 +241,7 @@ then
241241
cmake "$DIR/../Release/" \
242242
-DCMAKE_TOOLCHAIN_FILE=../android-cmake/android.toolchain.cmake \
243243
-DANDROID_ABI=x86 \
244-
-DANDROID_TOOLCHAIN_NAME=x86-clang3.6 \
244+
-DANDROID_TOOLCHAIN_NAME=x86-clang3.8 \
245245
-DANDROID_STL=none \
246246
-DANDROID_STL_FORCE_FEATURES=ON \
247247
-DANDROID_NDK="${ANDROID_NDK}" \
@@ -251,4 +251,4 @@ then
251251
make -j 1
252252
)
253253
)
254-
fi
254+
fi

‎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/build/package_info.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<package>
22
<metadata>
33
<base_id>cpprestsdk</base_id>
4-
<version>2.7.0</version>
4+
<version>2.9.0</version>
55
<authors>casablancacore</authors>
66
<owners>Microsoft, Visual C++</owners>
77
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
@@ -10,7 +10,7 @@
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1111
<summary>The C++ REST SDK is a cross-platform, modern, and asynchronous library that enables developers to access and author connected applications.</summary>
1212
<description>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.</description>
13-
<releaseNotes>https://github.com/Microsoft/cpprestsdk/releases/tag/v2.7.0</releaseNotes>
13+
<releaseNotes>https://github.com/Microsoft/cpprestsdk/releases/tag/v2.9.0</releaseNotes>
1414
<copyright>Copyright 2015</copyright>
1515
<tags>cpprestsdk Casablanca REST JSON HTTP URI WebSockets</tags>
1616
</metadata>
@@ -28,10 +28,10 @@
2828
<AdditionalOptions Condition="'$(PlatformToolset)'=='v140'">/d2notypeopt %(AdditionalOptions)</AdditionalOptions>
2929
<PreprocessorDefinitions Condition="'$(PlatformToolset)' == 'v120_xp'">CPPREST_TARGET_XP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
3030
<!-- Workaround Visual Studio Android bug missing -funwind-tables if -fexceptions is specified. -->
31-
<AdditionalOptions Condition="'$(PlatformToolset)' == 'Clang_3_6'">-funwind-tables %(AdditionalOptions)</AdditionalOptions>
31+
<AdditionalOptions Condition="'$(PlatformToolset)' == 'Clang_3_8'">-funwind-tables %(AdditionalOptions)</AdditionalOptions>
3232
</ClCompile>
3333
<Link>
34-
<LibraryDependencies Condition="'$(PlatformToolset)' == 'Clang_3_6'">m;%(LibraryDependencies)</LibraryDependencies>
34+
<LibraryDependencies Condition="'$(PlatformToolset)' == 'Clang_3_8'">m;%(LibraryDependencies)</LibraryDependencies>
3535
</Link>
3636
</ItemDefinitionGroup>
3737
</msbuild_hook>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,33 +26,33 @@
2626
<ProjectGuid>{AFB49019-965B-4C10-BAFF-C86C16D58010}</ProjectGuid>
2727
<Keyword>Android</Keyword>
2828
<ApplicationType>Android</ApplicationType>
29-
<ApplicationTypeRevision>1.0</ApplicationTypeRevision>
29+
<ApplicationTypeRevision>2.0</ApplicationTypeRevision>
3030
<ProjectName>cpprestsdk140.android</ProjectName>
3131
</PropertyGroup>
3232
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3333
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Product.Settings" />
3434
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
3535
<ConfigurationType>StaticLibrary</ConfigurationType>
3636
<UseDebugLibraries>true</UseDebugLibraries>
37-
<PlatformToolset>Clang_3_6</PlatformToolset>
37+
<PlatformToolset>Clang_3_8</PlatformToolset>
3838
<UseOfStl>gnustl_static</UseOfStl>
3939
</PropertyGroup>
4040
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
4141
<ConfigurationType>StaticLibrary</ConfigurationType>
4242
<UseDebugLibraries>true</UseDebugLibraries>
43-
<PlatformToolset>Clang_3_6</PlatformToolset>
43+
<PlatformToolset>Clang_3_8</PlatformToolset>
4444
<UseOfStl>gnustl_static</UseOfStl>
4545
</PropertyGroup>
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
4747
<ConfigurationType>StaticLibrary</ConfigurationType>
4848
<UseDebugLibraries>false</UseDebugLibraries>
49-
<PlatformToolset>Clang_3_6</PlatformToolset>
49+
<PlatformToolset>Clang_3_8</PlatformToolset>
5050
<UseOfStl>gnustl_static</UseOfStl>
5151
</PropertyGroup>
5252
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
5353
<ConfigurationType>StaticLibrary</ConfigurationType>
5454
<UseDebugLibraries>false</UseDebugLibraries>
55-
<PlatformToolset>Clang_3_6</PlatformToolset>
55+
<PlatformToolset>Clang_3_8</PlatformToolset>
5656
<UseOfStl>gnustl_static</UseOfStl>
5757
</PropertyGroup>
5858
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -125,14 +125,14 @@
125125
<Import Project="..\android.vcxitems" Label="Shared" Condition="Exists('..\android.vcxitems')" />
126126
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
127127
<ImportGroup Label="ExtensionTargets">
128-
<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')" />
128+
<Import Project="$(PackagesRoot)\openssl-android.1.0.2.1\build\native\openssl-android.targets" Condition="Exists('$(PackagesRoot)\openssl-android.1.0.2.1\build\native\openssl-android.targets')" />
129129
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
130130
</ImportGroup>
131131
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
132132
<PropertyGroup>
133133
<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>
134134
</PropertyGroup>
135-
<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'))" />
135+
<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.1\build\native\openssl-android.targets'))" />
136136
<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'))" />
137137
</Target>
138138
</Project>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
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_system-android" version="1.55.0.1" targetFramework="native" />
9-
<package id="boost_thread-android" version="1.55.0.1" targetFramework="native" />
10-
<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_system-android" version="1.55.0.2" targetFramework="native" />
9+
<package id="boost_thread-android" version="1.55.0.2" targetFramework="native" />
10+
<package id="openssl-android" version="1.0.2.1" targetFramework="native" />
1111
</packages>

‎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"

0 commit comments

Comments
 (0)