diff --git a/Build_android/boost-for-android-x86.patch b/Build_android/boost-for-android-x86.patch index be0957dd3b..4e24b988e3 100644 --- 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++ : -arm-linux-androideabi-ar -+--gcc-toolchain="$(AndroidNDKRoot)/toolchains/x86-4.8/prebuilt/$(PlatformOS)-x86_64" ++--gcc-toolchain="$(AndroidNDKRoot)/toolchains/x86-4.9/prebuilt/$(PlatformOS)-x86_64" -fexceptions -frtti -fpic @@ -89,10 +109,10 @@ index 666d4c8..4cd3441 100644 -g --I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.6/include --I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi/include -+-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.8/include -+-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86/include ++-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.9/include ++-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include +--target=i686-none-linux-android -+--gcc-toolchain="$(AndroidNDKRoot)/toolchains/x86-4.8/prebuilt/$(PlatformOS)-x86_64" ++--gcc-toolchain="$(AndroidNDKRoot)/toolchains/x86-4.9/prebuilt/$(PlatformOS)-x86_64" +--sysroot=$(AndroidNDKRoot)/platforms/android-9/arch-x86 # @Moss - Above are the 'oficial' android flags -arm diff --git a/Build_android/boost-for-android.patch b/Build_android/boost-for-android.patch index 0b941435e3..2b86e8f833 100644 --- 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++ : -arm-linux-androideabi-ar -+--gcc-toolchain="$(AndroidNDKRoot)/toolchains/arm-linux-androideabi-4.8/prebuilt/$(PlatformOS)-x86_64" ++--gcc-toolchain="$(AndroidNDKRoot)/toolchains/arm-linux-androideabi-4.9/prebuilt/$(PlatformOS)-x86_64" -fexceptions -frtti -fpic @@ -134,15 +153,15 @@ index 666d4c8..df597f6 100644 -g --I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.6/include --I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi/include -+-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.8/include -+-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi/include ++-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.9/include ++-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include +--target=armv7-none-linux-androideabi -+--gcc-toolchain="$(AndroidNDKRoot)/toolchains/arm-linux-androideabi-4.8/prebuilt/$(PlatformOS)-x86_64" ++--gcc-toolchain="$(AndroidNDKRoot)/toolchains/arm-linux-androideabi-4.9/prebuilt/$(PlatformOS)-x86_64" +--sysroot=$(AndroidNDKRoot)/platforms/android-9/arch-arm # @Moss - Above are the 'oficial' android flags arm -fvisibility=hidden -@@ -125,9 +84,11 @@ arm-linux-androideabi-g++ +@@ -125,9 +85,11 @@ arm-linux-androideabi-g++ -D__arm__ -D_REENTRANT -D_GLIBCXX__PTHREADS diff --git a/Build_android/configure.sh b/Build_android/configure.sh index 5cef31364f..75697672a6 100755 --- 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 \ No newline at end of file +fi diff --git a/Release/include/cpprest/details/http_server_asio.h b/Release/include/cpprest/details/http_server_asio.h index e34435d09c..c9ed53b006 100644 --- 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 #include diff --git a/Release/include/pplx/threadpool.h b/Release/include/pplx/threadpool.h index c778040737..4a88a75c44 100644 --- 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 index fc3b1d002c..a2f9550b13 100644 --- a/Release/src/build/package_info.xml +++ b/Release/src/build/package_info.xml @@ -1,7 +1,7 @@ cpprestsdk - 2.7.0 + 2.9.0 casablancacore Microsoft, Visual C++ http://www.apache.org/licenses/LICENSE-2.0 @@ -10,7 +10,7 @@ false The C++ REST SDK is a cross-platform, modern, and asynchronous library that enables developers to access and author connected applications. 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. - https://github.com/Microsoft/cpprestsdk/releases/tag/v2.7.0 + https://github.com/Microsoft/cpprestsdk/releases/tag/v2.9.0 Copyright 2015 cpprestsdk Casablanca REST JSON HTTP URI WebSockets @@ -28,10 +28,10 @@ /d2notypeopt %(AdditionalOptions) CPPREST_TARGET_XP;%(PreprocessorDefinitions) - -funwind-tables %(AdditionalOptions) + -funwind-tables %(AdditionalOptions) - m;%(LibraryDependencies) + m;%(LibraryDependencies) diff --git a/Release/src/build/vs14.android/casablanca140.android.vcxproj b/Release/src/build/vs14.android/casablanca140.android.vcxproj index 6e7d82feaf..038f56b125 100644 --- a/Release/src/build/vs14.android/casablanca140.android.vcxproj +++ b/Release/src/build/vs14.android/casablanca140.android.vcxproj @@ -26,7 +26,7 @@ {AFB49019-965B-4C10-BAFF-C86C16D58010} Android Android - 1.0 + 2.0 cpprestsdk140.android @@ -34,25 +34,25 @@ StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static @@ -125,14 +125,14 @@ - + 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}. - + diff --git a/Release/src/build/vs14.android/packages.config b/Release/src/build/vs14.android/packages.config index ad9ec48240..746b7f61a2 100644 --- a/Release/src/build/vs14.android/packages.config +++ b/Release/src/build/vs14.android/packages.config @@ -1,11 +1,11 @@  - - - - - - - + + + + + + + \ No newline at end of file diff --git a/Release/src/http/client/http_client_asio.cpp b/Release/src/http/client/http_client_asio.cpp index 6963aee43d..10984ebff7 100644 --- 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 #include diff --git a/Release/src/pch/stdafx.h b/Release/src/pch/stdafx.h index f177ad5004..432f9e7449 100644 --- 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" diff --git a/Release/tests/common/TestRunner/vs14.android/TestRunner.android.NativeActivity/TestRunner.android.NativeActivity.vcxproj b/Release/tests/common/TestRunner/vs14.android/TestRunner.android.NativeActivity/TestRunner.android.NativeActivity.vcxproj index 8a3b63bb63..d798ca823d 100644 --- a/Release/tests/common/TestRunner/vs14.android/TestRunner.android.NativeActivity/TestRunner.android.NativeActivity.vcxproj +++ b/Release/tests/common/TestRunner/vs14.android/TestRunner.android.NativeActivity/TestRunner.android.NativeActivity.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -26,28 +26,32 @@ en-US 14.0 Android - 1.0 + 2.0 DynamicLibrary true gnustl_static + Clang_3_8 DynamicLibrary true gnustl_static + Clang_3_8 DynamicLibrary false gnustl_static + Clang_3_8 DynamicLibrary false gnustl_static + Clang_3_8 @@ -253,28 +257,28 @@ - + - - - - - - - + + + + + + + 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}. - + - - - - - - - + + + + + + + - + \ No newline at end of file diff --git a/Release/tests/common/TestRunner/vs14.android/TestRunner.android.NativeActivity/packages.config b/Release/tests/common/TestRunner/vs14.android/TestRunner.android.NativeActivity/packages.config index 5eea3261b9..c99b35a84e 100644 --- a/Release/tests/common/TestRunner/vs14.android/TestRunner.android.NativeActivity/packages.config +++ b/Release/tests/common/TestRunner/vs14.android/TestRunner.android.NativeActivity/packages.config @@ -1,12 +1,12 @@  - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/Release/tests/common/UnitTestpp/vs14.android/UnitTestpp140.android.vcxproj b/Release/tests/common/UnitTestpp/vs14.android/UnitTestpp140.android.vcxproj index d994188a6f..c7b52f072b 100644 --- a/Release/tests/common/UnitTestpp/vs14.android/UnitTestpp140.android.vcxproj +++ b/Release/tests/common/UnitTestpp/vs14.android/UnitTestpp140.android.vcxproj @@ -95,7 +95,7 @@ {3EFD8540-A54D-4900-887E-F856162535A0} Android Android - 1.0 + 2.0 UnitTestpp140.android @@ -103,25 +103,25 @@ StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static @@ -187,13 +187,13 @@ - + 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}. - + diff --git a/Release/tests/common/utilities/vs14.android/CommonUtilities140.android.vcxproj b/Release/tests/common/utilities/vs14.android/CommonUtilities140.android.vcxproj index 5ee0a1acc8..53592625d0 100644 --- a/Release/tests/common/utilities/vs14.android/CommonUtilities140.android.vcxproj +++ b/Release/tests/common/utilities/vs14.android/CommonUtilities140.android.vcxproj @@ -46,7 +46,7 @@ {7C4E6E33-42E2-4472-9319-DDE7564F3DAE} Android Android - 1.0 + 2.0 CommonUtilities140.android @@ -54,25 +54,25 @@ StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static @@ -136,13 +136,13 @@ - + 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}. - + diff --git a/Release/tests/functional/http/client/authentication_tests.cpp b/Release/tests/functional/http/client/authentication_tests.cpp index d5cdd4605a..31ecea7cfa 100644 --- a/Release/tests/functional/http/client/authentication_tests.cpp +++ b/Release/tests/functional/http/client/authentication_tests.cpp @@ -38,8 +38,15 @@ #endif #if !defined(_WIN32) +#if defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Winfinite-recursion" +#endif #include #include +#if defined(__clang__) +#pragma clang diagnostic pop +#endif #endif using namespace web; diff --git a/Release/tests/functional/http/client/vs14.android/HttpClient140_test.android.vcxproj b/Release/tests/functional/http/client/vs14.android/HttpClient140_test.android.vcxproj index 0ff16c0a20..9d4978a9af 100644 --- a/Release/tests/functional/http/client/vs14.android/HttpClient140_test.android.vcxproj +++ b/Release/tests/functional/http/client/vs14.android/HttpClient140_test.android.vcxproj @@ -64,7 +64,7 @@ {0EE481DA-A97F-4831-9119-C65EB2D7B4DA} Android Android - 1.0 + 2.0 HttpClient140_test.android @@ -72,25 +72,25 @@ StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static @@ -156,13 +156,13 @@ - + 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}. - + diff --git a/Release/tests/functional/http/client/vs14.android/packages.config b/Release/tests/functional/http/client/vs14.android/packages.config index 299115366f..4bd0fd80ad 100644 --- a/Release/tests/functional/http/client/vs14.android/packages.config +++ b/Release/tests/functional/http/client/vs14.android/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Release/tests/functional/http/listener/vs14.android/HttpListener140_test.android.vcxproj b/Release/tests/functional/http/listener/vs14.android/HttpListener140_test.android.vcxproj index 0bae47f684..2bb8421046 100644 --- a/Release/tests/functional/http/listener/vs14.android/HttpListener140_test.android.vcxproj +++ b/Release/tests/functional/http/listener/vs14.android/HttpListener140_test.android.vcxproj @@ -56,7 +56,7 @@ {2B00D1C0-1A93-4A32-8932-C3CC43ACFF45} Android Android - 1.0 + 2.0 HttpListener140_test.android @@ -64,25 +64,25 @@ StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static @@ -148,13 +148,13 @@ - + 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}. - + diff --git a/Release/tests/functional/http/utilities/vs14.android/HttpTestUtilities140.android.vcxproj b/Release/tests/functional/http/utilities/vs14.android/HttpTestUtilities140.android.vcxproj index 4f8db665d9..62a0cf8a5a 100644 --- a/Release/tests/functional/http/utilities/vs14.android/HttpTestUtilities140.android.vcxproj +++ b/Release/tests/functional/http/utilities/vs14.android/HttpTestUtilities140.android.vcxproj @@ -52,7 +52,7 @@ {B444EE47-1340-4A74-820D-CDD55F9F22F7} Android Android - 1.0 + 2.0 HttpTestUtilities140.android @@ -60,25 +60,25 @@ StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static @@ -144,13 +144,13 @@ - + 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}. - + diff --git a/Release/tests/functional/json/vs14.android/JSON140_test.android.vcxproj b/Release/tests/functional/json/vs14.android/JSON140_test.android.vcxproj index a771d56274..16dd72d5bc 100644 --- a/Release/tests/functional/json/vs14.android/JSON140_test.android.vcxproj +++ b/Release/tests/functional/json/vs14.android/JSON140_test.android.vcxproj @@ -50,7 +50,7 @@ {169555EF-8A80-405E-A815-CFE70028CA45} Android Android - 1.0 + 2.0 JSON140_test.android @@ -58,25 +58,25 @@ StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static @@ -142,13 +142,13 @@ - + 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}. - + diff --git a/Release/tests/functional/pplx/pplx_test/vs14.android/pplx140_test.android.vcxproj b/Release/tests/functional/pplx/pplx_test/vs14.android/pplx140_test.android.vcxproj index c6a34bc9e0..7fd3c7b631 100644 --- a/Release/tests/functional/pplx/pplx_test/vs14.android/pplx140_test.android.vcxproj +++ b/Release/tests/functional/pplx/pplx_test/vs14.android/pplx140_test.android.vcxproj @@ -45,7 +45,7 @@ {DF670B4E-692C-424E-BCFD-F63D34FE5CD3} Android Android - 1.0 + 2.0 pplx140_test.android @@ -53,25 +53,25 @@ StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static @@ -137,13 +137,13 @@ - + 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}. - + diff --git a/Release/tests/functional/streams/vs14.android/streams140_test.android.vcxproj b/Release/tests/functional/streams/vs14.android/streams140_test.android.vcxproj index 035631cf2b..81ff3ad878 100644 --- a/Release/tests/functional/streams/vs14.android/streams140_test.android.vcxproj +++ b/Release/tests/functional/streams/vs14.android/streams140_test.android.vcxproj @@ -49,7 +49,7 @@ {B9DA540F-95F7-485E-ADF4-C94A17BFA1EB} Android Android - 1.0 + 2.0 streams140_test.android @@ -57,25 +57,25 @@ StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static @@ -141,13 +141,13 @@ - + 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}. - + diff --git a/Release/tests/functional/uri/vs14.android/Uri140_test.android.vcxproj b/Release/tests/functional/uri/vs14.android/Uri140_test.android.vcxproj index 22c087567d..bf66be6210 100644 --- a/Release/tests/functional/uri/vs14.android/Uri140_test.android.vcxproj +++ b/Release/tests/functional/uri/vs14.android/Uri140_test.android.vcxproj @@ -52,7 +52,7 @@ {63569C1A-A168-442A-B160-76D0256803AF} Android Android - 1.0 + 2.0 Uri140_test.android @@ -60,25 +60,25 @@ StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static @@ -144,13 +144,13 @@ - + 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}. - + diff --git a/Release/tests/functional/utils/vs14.android/Utils140_test.android.vcxproj b/Release/tests/functional/utils/vs14.android/Utils140_test.android.vcxproj index 1a2bb5e255..3bffb9f385 100644 --- a/Release/tests/functional/utils/vs14.android/Utils140_test.android.vcxproj +++ b/Release/tests/functional/utils/vs14.android/Utils140_test.android.vcxproj @@ -48,7 +48,7 @@ {423FCE6D-7400-4C09-9038-4438FBB089D4} Android Android - 1.0 + 2.0 Utils140_test.android @@ -56,25 +56,25 @@ StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static @@ -140,13 +140,13 @@ - + 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}. - + diff --git a/Release/tests/functional/websockets/client/vs14.android/websocketsclient140_test.android.vcxproj b/Release/tests/functional/websockets/client/vs14.android/websocketsclient140_test.android.vcxproj index 52c27223e4..230810860b 100644 --- a/Release/tests/functional/websockets/client/vs14.android/websocketsclient140_test.android.vcxproj +++ b/Release/tests/functional/websockets/client/vs14.android/websocketsclient140_test.android.vcxproj @@ -50,7 +50,7 @@ {3E8466B1-7CBC-489D-8E6B-5E45BAB4D627} Android Android - 1.0 + 2.0 websocketsclient140_test.android @@ -58,25 +58,25 @@ StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static @@ -142,13 +142,13 @@ - + 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}. - + diff --git a/Release/tests/functional/websockets/utilities/test_websocket_server.cpp b/Release/tests/functional/websockets/utilities/test_websocket_server.cpp index 4485e93f86..c091100fba 100644 --- a/Release/tests/functional/websockets/utilities/test_websocket_server.cpp +++ b/Release/tests/functional/websockets/utilities/test_websocket_server.cpp @@ -39,9 +39,18 @@ #endif #endif /* _WIN32 */ +#if defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Winfinite-recursion" +#endif + #include #include +#if defined(__clang__) +#pragma clang diagnostic pop +#endif + #ifdef _WIN32 #pragma warning( pop ) #endif diff --git a/Release/tests/functional/websockets/utilities/vs14.android/packages.config b/Release/tests/functional/websockets/utilities/vs14.android/packages.config index 299115366f..4bd0fd80ad 100644 --- a/Release/tests/functional/websockets/utilities/vs14.android/packages.config +++ b/Release/tests/functional/websockets/utilities/vs14.android/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Release/tests/functional/websockets/utilities/vs14.android/websockets_test_utilities140.android.vcxproj b/Release/tests/functional/websockets/utilities/vs14.android/websockets_test_utilities140.android.vcxproj index c04a6bbe46..3962040a52 100644 --- a/Release/tests/functional/websockets/utilities/vs14.android/websockets_test_utilities140.android.vcxproj +++ b/Release/tests/functional/websockets/utilities/vs14.android/websockets_test_utilities140.android.vcxproj @@ -44,7 +44,7 @@ {0149E1C2-FBF3-48B6-9996-D6753F689DFB} Android Android - 1.0 + 2.0 websockets_test_utilities140.android @@ -52,25 +52,25 @@ StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary true - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static StaticLibrary false - Clang_3_6 + Clang_3_8 gnustl_static @@ -136,13 +136,13 @@ - + 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}. - +