Merge branch 'clang38' into development

jasonsandlin · Oct 13, 2016 · 9aed8c3 · 9aed8c3
2 parents edfb941 + c873d63
commit 9aed8c3
Show file tree

Hide file tree

Showing 28 changed files with 226 additions and 163 deletions.
diff --git a/Build_android/boost-for-android-x86.patch b/Build_android/boost-for-android-x86.patch
@@ -1,8 +1,22 @@
 diff --git a/build-android.sh b/build-android.sh
-index 40453f7..7ffc050 100755
+index 40453f7..5902fe2 100755
 --- a/build-android.sh
 +++ b/build-android.sh
-@@ -258,9 +258,14 @@ case "$NDK_RN" in
+@@ -195,8 +195,12 @@ case "$HOST_OS" in
+         PlatformOS=linux
+ esac
+
++NDK_SOURCE_PROPERTIES=$AndroidNDKRoot"/source.properties"
+ NDK_RELEASE_FILE=$AndroidNDKRoot"/RELEASE.TXT"
+-if [ -f "${NDK_RELEASE_FILE}" ]; then
++if [ -f "${NDK_SOURCE_PROPERTIES}" ]; then
++    version=$(grep -i '^Pkg.Revision =' $NDK_SOURCE_PROPERTIES | cut -f2- -d=)
++    NDK_RN=$(echo $version | awk -F. '{print $1}')
++elif [ -f "${NDK_RELEASE_FILE}" ]; then
+     NDK_RN=`cat $NDK_RELEASE_FILE | sed 's/^r\(.*\)$/\1/g'`
+ elif [ -n "${AndroidSourcesDetected}" ]; then
+     if [ -f "${ANDROID_BUILD_TOP}/ndk/docs/CHANGES.html" ]; then
+@@ -258,10 +262,20 @@ case "$NDK_RN" in
  		TOOLSET=gcc-androidR8e
  		;;
  	"10 (64-bit)")
@@ -18,17 +32,23 @@ index 40453f7..7ffc050 100755
 +		CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/clang++
 +		TOOLSET=clang-androidR8e
                  ;;
++	11)
++		TOOLCHAIN=llvm
++		CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/clang++
++		TOOLSET=clang-androidR8e
++		;;
  	*)
  		echo "Undefined or not supported Android NDK version!"
-@@ -391,6 +396,7 @@ echo "Building boost for android"
+ 		exit 1
+@@ -391,6 +405,7 @@ echo "Building boost for android"
    export AndroidBinariesPath=`dirname $CXXPATH`
    export PATH=$AndroidBinariesPath:$PATH
    export AndroidNDKRoot
 +  export PlatformOS
    export NO_BZIP2=1
-
+ 
    cxxflags=""
-@@ -405,7 +411,7 @@ echo "Building boost for android"
+@@ -405,7 +420,7 @@ echo "Building boost for android"
           --layout=versioned           \
           --prefix="./../$BUILD_DIR/"  \
           $LIBRARIES                   \
@@ -38,11 +58,11 @@ index 40453f7..7ffc050 100755
    } | tee -a $PROGDIR/build.log
 
 diff --git a/configs/user-config-boost-1_55_0.jam b/configs/user-config-boost-1_55_0.jam
-index 666d4c8..4cd3441 100644
+index 666d4c8..93aba68 100644
 --- a/configs/user-config-boost-1_55_0.jam
 +++ b/configs/user-config-boost-1_55_0.jam
 @@ -39,93 +39,47 @@
-
+ 
  import os ;
  local AndroidNDKRoot = [ os.environ AndroidNDKRoot ] ;
 +local PlatformOS = [ os.environ PlatformOS ] ;
@@ -53,10 +73,10 @@ index 666d4c8..4cd3441 100644
 +using clang : androidR8e
  :
 -arm-linux-androideabi-g++
-+$(AndroidNDKRoot)/toolchains/llvm-3.6/prebuilt/$(PlatformOS)-x86_64/bin/clang++
++$(AndroidNDKRoot)/toolchains/llvm/prebuilt/$(PlatformOS)-x86_64/bin/clang++
  :
 -<archiver>arm-linux-androideabi-ar
-+<compileflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/x86-4.8/prebuilt/$(PlatformOS)-x86_64"
++<compileflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/x86-4.9/prebuilt/$(PlatformOS)-x86_64"
  <compileflags>-fexceptions
  <compileflags>-frtti
  <compileflags>-fpic
@@ -89,10 +109,10 @@ index 666d4c8..4cd3441 100644
  <compileflags>-g
 -<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.6/include
 -<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi/include
-+<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.8/include
-+<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86/include
++<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.9/include
++<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include
 +<linkflags>--target=i686-none-linux-android
-+<linkflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/x86-4.8/prebuilt/$(PlatformOS)-x86_64"
++<linkflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/x86-4.9/prebuilt/$(PlatformOS)-x86_64"
 +<linkflags>--sysroot=$(AndroidNDKRoot)/platforms/android-9/arch-x86
  # @Moss - Above are the 'oficial' android flags
 -<architecture>arm

diff --git a/Build_android/boost-for-android.patch b/Build_android/boost-for-android.patch
@@ -1,8 +1,22 @@
 diff --git a/build-android.sh b/build-android.sh
-index 40453f7..ad78ddf 100755
+index 40453f7..5902fe2 100755
 --- a/build-android.sh
 +++ b/build-android.sh
-@@ -258,9 +258,14 @@ case "$NDK_RN" in
+@@ -195,8 +195,12 @@ case "$HOST_OS" in
+         PlatformOS=linux
+ esac
+
++NDK_SOURCE_PROPERTIES=$AndroidNDKRoot"/source.properties"
+ NDK_RELEASE_FILE=$AndroidNDKRoot"/RELEASE.TXT"
+-if [ -f "${NDK_RELEASE_FILE}" ]; then
++if [ -f "${NDK_SOURCE_PROPERTIES}" ]; then
++    version=$(grep -i '^Pkg.Revision =' $NDK_SOURCE_PROPERTIES | cut -f2- -d=)
++    NDK_RN=$(echo $version | awk -F. '{print $1}')
++elif [ -f "${NDK_RELEASE_FILE}" ]; then
+     NDK_RN=`cat $NDK_RELEASE_FILE | sed 's/^r\(.*\)$/\1/g'`
+ elif [ -n "${AndroidSourcesDetected}" ]; then
+     if [ -f "${ANDROID_BUILD_TOP}/ndk/docs/CHANGES.html" ]; then
+@@ -258,10 +262,20 @@ case "$NDK_RN" in
  		TOOLSET=gcc-androidR8e
  		;;
  	"10 (64-bit)")
@@ -18,18 +32,23 @@ index 40453f7..ad78ddf 100755
 +		CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/clang++
 +		TOOLSET=clang-androidR8e
                  ;;
++	11)
++		TOOLCHAIN=llvm
++		CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/clang++
++		TOOLSET=clang-androidR8e
++		;;
  	*)
  		echo "Undefined or not supported Android NDK version!"
-@@ -391,6 +396,7 @@ echo "Building boost for android"
+ 		exit 1
+@@ -391,6 +405,7 @@ echo "Building boost for android"
    export AndroidBinariesPath=`dirname $CXXPATH`
    export PATH=$AndroidBinariesPath:$PATH
    export AndroidNDKRoot
 +  export PlatformOS
    export NO_BZIP2=1
-
+ 
    cxxflags=""
-@@ -405,7 +411,7 @@ echo "Building boost for android"
-          threading=multi              \
+@@ -405,7 +420,7 @@ echo "Building boost for android"
           --layout=versioned           \
           --prefix="./../$BUILD_DIR/"  \
           $LIBRARIES                   \
@@ -39,25 +58,25 @@ index 40453f7..ad78ddf 100755
    } | tee -a $PROGDIR/build.log
 
 diff --git a/configs/user-config-boost-1_55_0.jam b/configs/user-config-boost-1_55_0.jam
-index 666d4c8..df597f6 100644
+index 666d4c8..cdab118 100644
 --- a/configs/user-config-boost-1_55_0.jam
 +++ b/configs/user-config-boost-1_55_0.jam
 @@ -39,84 +39,44 @@
-
+ 
  import os ;
  local AndroidNDKRoot = [ os.environ AndroidNDKRoot ] ;
 +local PlatformOS = [ os.environ PlatformOS ] ;
-
+ 
  # --------------------------------------------------------------------
 -# Is same for 8b, 8c and 8d
 -using gcc : androidR8b
 +using clang : androidR8e
  :
 -arm-linux-androideabi-g++
-+$(AndroidNDKRoot)/toolchains/llvm-3.6/prebuilt/$(PlatformOS)-x86_64/bin/clang++
++$(AndroidNDKRoot)/toolchains/llvm/prebuilt/$(PlatformOS)-x86_64/bin/clang++
  :
 -<archiver>arm-linux-androideabi-ar
-+<compileflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/arm-linux-androideabi-4.8/prebuilt/$(PlatformOS)-x86_64"
++<compileflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/arm-linux-androideabi-4.9/prebuilt/$(PlatformOS)-x86_64"
  <compileflags>-fexceptions
  <compileflags>-frtti
  <compileflags>-fpic
@@ -134,15 +153,15 @@ index 666d4c8..df597f6 100644
  <compileflags>-g
 -<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.6/include
 -<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi/include
-+<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.8/include
-+<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi/include
++<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.9/include
++<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include
 +<linkflags>--target=armv7-none-linux-androideabi
-+<linkflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/arm-linux-androideabi-4.8/prebuilt/$(PlatformOS)-x86_64"
++<linkflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/arm-linux-androideabi-4.9/prebuilt/$(PlatformOS)-x86_64"
 +<linkflags>--sysroot=$(AndroidNDKRoot)/platforms/android-9/arch-arm
  # @Moss - Above are the 'oficial' android flags
  <architecture>arm
  <compileflags>-fvisibility=hidden
-@@ -125,9 +84,11 @@ arm-linux-androideabi-g++
+@@ -125,9 +85,11 @@ arm-linux-androideabi-g++
  <cxxflags>-D__arm__
  <cxxflags>-D_REENTRANT
  <cxxflags>-D_GLIBCXX__PTHREADS

diff --git a/Build_android/configure.sh b/Build_android/configure.sh
@@ -193,7 +193,7 @@ then
 	cmake "$DIR/../Release/" \
 	    -DCMAKE_TOOLCHAIN_FILE=../android-cmake/android.toolchain.cmake \
 	    -DANDROID_ABI=armeabi-v7a \
-	    -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.6 \
+	    -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.8 \
 	    -DANDROID_STL=none \
 	    -DANDROID_STL_FORCE_FEATURES=ON \
             -DANDROID_NATIVE_API_LEVEL=android-9 \
@@ -209,7 +209,7 @@ then
 	cmake "$DIR/../Release/" \
 	    -DCMAKE_TOOLCHAIN_FILE=../android-cmake/android.toolchain.cmake \
 	    -DANDROID_ABI=armeabi-v7a \
-	    -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.6 \
+	    -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.8 \
 	    -DANDROID_STL=none \
 	    -DANDROID_STL_FORCE_FEATURES=ON \
 	    -DANDROID_NDK="${ANDROID_NDK}" \
@@ -225,7 +225,7 @@ then
 	cmake "$DIR/../Release/" \
 	    -DCMAKE_TOOLCHAIN_FILE=../android-cmake/android.toolchain.cmake \
 	    -DANDROID_ABI=x86 \
-	    -DANDROID_TOOLCHAIN_NAME=x86-clang3.6 \
+	    -DANDROID_TOOLCHAIN_NAME=x86-clang3.8 \
 	    -DANDROID_STL=none \
 	    -DANDROID_STL_FORCE_FEATURES=ON \
             -DANDROID_NATIVE_API_LEVEL=android-9 \
@@ -241,7 +241,7 @@ then
 	cmake "$DIR/../Release/" \
 	    -DCMAKE_TOOLCHAIN_FILE=../android-cmake/android.toolchain.cmake \
 	    -DANDROID_ABI=x86 \
-	    -DANDROID_TOOLCHAIN_NAME=x86-clang3.6 \
+	    -DANDROID_TOOLCHAIN_NAME=x86-clang3.8 \
 	    -DANDROID_STL=none \
 	    -DANDROID_STL_FORCE_FEATURES=ON \
 	    -DANDROID_NDK="${ANDROID_NDK}" \
@@ -251,4 +251,4 @@ then
 	make -j 1
     )
 )
-fi
+fi
diff --git a/Release/include/cpprest/details/http_server_asio.h b/Release/include/cpprest/details/http_server_asio.h
@@ -20,6 +20,7 @@
 #if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wconversion"
+#pragma clang diagnostic ignored "-Winfinite-recursion"
 #endif
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>

diff --git a/Release/include/pplx/threadpool.h b/Release/include/pplx/threadpool.h
@@ -30,6 +30,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wconversion"
 #pragma clang diagnostic ignored "-Wunreachable-code"
+#pragma clang diagnostic ignored "-Winfinite-recursion"
 #endif
 #include "boost/asio.hpp"
 #if defined(__clang__)

diff --git a/Release/src/build/package_info.xml b/Release/src/build/package_info.xml
@@ -1,7 +1,7 @@
 <package>
   <metadata>
     <base_id>cpprestsdk</base_id>
-    <version>2.7.0</version>
+    <version>2.9.0</version>
     <authors>casablancacore</authors>
     <owners>Microsoft, Visual C++</owners>
     <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
@@ -10,7 +10,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <summary>The C++ REST SDK is a cross-platform, modern, and asynchronous library that enables developers to access and author connected applications.</summary>
     <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>
-    <releaseNotes>https://github.com/Microsoft/cpprestsdk/releases/tag/v2.7.0</releaseNotes>
+    <releaseNotes>https://github.com/Microsoft/cpprestsdk/releases/tag/v2.9.0</releaseNotes>
     <copyright>Copyright 2015</copyright>
     <tags>cpprestsdk Casablanca REST JSON HTTP URI WebSockets</tags>
   </metadata>
@@ -28,10 +28,10 @@
         <AdditionalOptions Condition="'$(PlatformToolset)'=='v140'">/d2notypeopt %(AdditionalOptions)</AdditionalOptions>
         <PreprocessorDefinitions Condition="'$(PlatformToolset)' == 'v120_xp'">CPPREST_TARGET_XP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
         <!-- Workaround Visual Studio Android bug missing -funwind-tables if -fexceptions is specified. -->
-        <AdditionalOptions Condition="'$(PlatformToolset)' == 'Clang_3_6'">-funwind-tables %(AdditionalOptions)</AdditionalOptions>
+        <AdditionalOptions Condition="'$(PlatformToolset)' == 'Clang_3_8'">-funwind-tables %(AdditionalOptions)</AdditionalOptions>
       </ClCompile>
       <Link>
-        <LibraryDependencies Condition="'$(PlatformToolset)' == 'Clang_3_6'">m;%(LibraryDependencies)</LibraryDependencies>
+        <LibraryDependencies Condition="'$(PlatformToolset)' == 'Clang_3_8'">m;%(LibraryDependencies)</LibraryDependencies>
       </Link>
     </ItemDefinitionGroup>
   </msbuild_hook>

diff --git a/Release/src/build/vs14.android/casablanca140.android.vcxproj b/Release/src/build/vs14.android/casablanca140.android.vcxproj
@@ -26,33 +26,33 @@
     <ProjectGuid>{AFB49019-965B-4C10-BAFF-C86C16D58010}</ProjectGuid>
     <Keyword>Android</Keyword>
     <ApplicationType>Android</ApplicationType>
-    <ApplicationTypeRevision>1.0</ApplicationTypeRevision>
+    <ApplicationTypeRevision>2.0</ApplicationTypeRevision>
     <ProjectName>cpprestsdk140.android</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Product.Settings" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>Clang_3_6</PlatformToolset>
+    <PlatformToolset>Clang_3_8</PlatformToolset>
     <UseOfStl>gnustl_static</UseOfStl>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>Clang_3_6</PlatformToolset>
+    <PlatformToolset>Clang_3_8</PlatformToolset>
     <UseOfStl>gnustl_static</UseOfStl>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>Clang_3_6</PlatformToolset>
+    <PlatformToolset>Clang_3_8</PlatformToolset>
     <UseOfStl>gnustl_static</UseOfStl>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>Clang_3_6</PlatformToolset>
+    <PlatformToolset>Clang_3_8</PlatformToolset>
     <UseOfStl>gnustl_static</UseOfStl>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -125,14 +125,14 @@
   <Import Project="..\android.vcxitems" Label="Shared" Condition="Exists('..\android.vcxitems')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <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')" />
+    <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')" />
     <Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <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>
     </PropertyGroup>
-    <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'))" />
+    <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'))" />
     <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'))" />
   </Target>
 </Project>
diff --git a/Release/src/build/vs14.android/packages.config b/Release/src/build/vs14.android/packages.config
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="boost" version="1.55.0.16" targetFramework="Native" />
-  <package id="boost_atomic-android" version="1.55.0.1" targetFramework="native" />
-  <package id="boost_chrono-android" version="1.55.0.1" targetFramework="native" />
-  <package id="boost_date_time-android" version="1.55.0.1" targetFramework="native" />
-  <package id="boost_filesystem-android" version="1.55.0.1" targetFramework="native" />
-  <package id="boost_system-android" version="1.55.0.1" targetFramework="native" />
-  <package id="boost_thread-android" version="1.55.0.1" targetFramework="native" />
-  <package id="openssl-android" version="1.0.2.0" targetFramework="native" />
+  <package id="boost_atomic-android" version="1.55.0.2" targetFramework="native" />
+  <package id="boost_chrono-android" version="1.55.0.2" targetFramework="native" />
+  <package id="boost_date_time-android" version="1.55.0.2" targetFramework="native" />
+  <package id="boost_filesystem-android" version="1.55.0.2" targetFramework="native" />
+  <package id="boost_system-android" version="1.55.0.2" targetFramework="native" />
+  <package id="boost_thread-android" version="1.55.0.2" targetFramework="native" />
+  <package id="openssl-android" version="1.0.2.1" targetFramework="native" />
 </packages>
diff --git a/Release/src/http/client/http_client_asio.cpp b/Release/src/http/client/http_client_asio.cpp
@@ -30,6 +30,7 @@
 #if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-local-typedef"
+#pragma clang diagnostic ignored "-Winfinite-recursion"
 #endif
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>

diff --git a/Release/src/pch/stdafx.h b/Release/src/pch/stdafx.h
@@ -28,6 +28,7 @@
 #if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-local-typedef"
+#pragma clang diagnostic ignored "-Winfinite-recursion"
 #endif
 
 #include "cpprest/details/cpprest_compat.h"