Merge branch 'development' into clang-3-6-merge

Conflicts:
	Build_android/libiconv/jni/Application.mk

Author: ras0219-msft

Build_android/libiconv/jni/Android.mk

@@ -0,0 +1,6 @@
+# iOS folders that dependencies get stored in
+boostoniphone/
+boost.framework/
+ios-cmake/
+openssl/
+OpenSSL-for-iPhone/

Build_android/libiconv/jni/Application.mk

@@ -20,6 +20,8 @@ jracle
 gandziej 
 adish
 LeonidCSIT
+LocutusOfBorg
+kreuzerkrieg
 
 AutoDesk Inc.
 Cyrille Fauvel (cyrillef)

Build_android/libiconv/libiconv.patch

@@ -165,7 +165,20 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
 
 # These settings can be used by the test targets
 set(Casablanca_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
-set(Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include ${Boost_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/libs/websocketpp)
+
+find_path(WEBSOCKETPP_CONFIG websocketpp-config.cmake
+                       HINTS /usr/lib/cmake/websocketpp)
+find_path(WEBSOCKETPP_CONFIG_VERSION websocketpp-configVersion.cmake
+                       HINTS /usr/lib/cmake/websocketpp)
+if(WEBSOCKETPP_CONFIG AND WEBSOCKETPP_CONFIG_VERSION)
+  include(${WEBSOCKETPP_CONFIG}/websocketpp-config.cmake)
+  include(${WEBSOCKETPP_CONFIG}/websocketpp-configVersion.cmake)
+  message("-- Found websocketpp version " ${PACKAGE_VERSION} " on system")
+  set(Casablanca_INCLUDE_DIRS ${Casablanca_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${WEBSOCKETPP_INCLUDE_DIR})
+else(WEBSOCKETPP_CONFIG AND WEBSOCKETPP_CONFIG_VERSION)
+  set(Casablanca_INCLUDE_DIRS ${Casablanca_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/libs/websocketpp)
+  message("-- websocketpp not found, using the embedded version")
+endif(WEBSOCKETPP_CONFIG AND WEBSOCKETPP_CONFIG_VERSION)
 
 set(Casablanca_LIBRARY ${LIB}cpprest)
 set(Casablanca_LIBRARIES ${Casablanca_LIBRARY} ${Boost_LIBRARIES} ${Boost_FRAMEWORK})

Build_iOS/.gitignore

@@ -284,6 +284,11 @@ namespace details
         return std::unique_ptr<_Type>(new _Type(std::forward<_Arg1>(arg1), std::forward<_Arg2>(arg2), std::forward<_Arg3>(arg3)));
     }
 
+    template <typename _Type, typename _Arg1, typename _Arg2, typename _Arg3, typename _Arg4>
+    std::unique_ptr<_Type> make_unique(_Arg1&& arg1, _Arg2&& arg2, _Arg3&& arg3, _Arg4&& arg4) {
+        return std::unique_ptr<_Type>(new _Type(std::forward<_Arg1>(arg1), std::forward<_Arg2>(arg2), std::forward<_Arg3>(arg3), std::forward<_Arg4>(arg4)));
+    }
+
     /// <summary>
     /// Cross platform utility function for performing case insensitive string comparision.
     /// </summary>

CONTRIBUTORS.txt

@@ -441,7 +441,7 @@ namespace web {
         friend class uri_builder;
 
         // Encodes all characters not in given set determined by given function.
-        static utility::string_t encode_impl(const utility::string_t &raw, const std::function<bool(int)>& should_encode);
+        _ASYNCRTIMP static utility::string_t __cdecl encode_impl(const utility::string_t &raw, const std::function<bool __cdecl(int)>& should_encode);
 
         utility::string_t m_uri;
         details::uri_components m_components;

Release/CMakeLists.txt

@@ -30,7 +30,6 @@
 #include <iostream>
 #include <sstream>
 #include "cpprest/details/cpprest_compat.h"
-#include "cpprest/details/basic_types.h"
 
 #ifndef _WIN32
 # define __STDC_LIMIT_MACROS

Release/include/cpprest/asyncrt_utils.h

@@ -55,17 +55,11 @@
 // No SAL on non Windows platforms
 #include "cpprest/details/nosal.h"
 
-#if defined(__APPLE__) // Settings specific to Apple
-#define __cdecl
+#if not defined __cdecl
+#if defined cdecl
+#define __cdecl __attribute__ ((cdecl))
 #else
-
-// Settings specific to Linux and Android
-
-// Ignore cdecl on ANDROID ARM and 64bit
-#if defined(__ANDROID__) && defined(__arm__) || defined(__LP64__)
 #define __cdecl
-#else
-#define __cdecl __attribute__ ((cdecl))
 #endif
 
 #if defined(__ANDROID__)