Updating to websocketpp implementation to always use std::error_code, and adding macros to avoid x509 utilities on ARM.

Author: stgates

Release/include/cpprest/x509_cert_utilities.h

@@ -30,7 +30,7 @@
 #include <vector>
 #include <string>
 
-#if defined(__APPLE__) || defined(ANDROID) || (defined(_MS_WINDOWS)  && !defined(__cplusplus_winrt))
+#if defined(__APPLE__) || defined(ANDROID) || (defined(_MS_WINDOWS)  && !defined(__cplusplus_winrt) && !defined(_M_ARM))
 
 #include <boost/asio/ssl.hpp>
 

Release/src/http/client/x509_cert_utilities.cpp

@@ -50,7 +50,7 @@ using namespace crossplat;
 
 namespace web { namespace http { namespace client { namespace details {
 
-#if defined(__APPLE__) || defined(ANDROID) || (defined(_MS_WINDOWS)  && !defined(__cplusplus_winrt))
+#if defined(__APPLE__) || defined(ANDROID) || (defined(_MS_WINDOWS)  && !defined(__cplusplus_winrt) && !defined(_M_ARM))
 bool verify_cert_chain_platform_specific(boost::asio::ssl::verify_context &verifyCtx, const std::string &hostName)
 {
     X509_STORE_CTX *storeContext = verifyCtx.native_handle();
@@ -106,7 +106,7 @@ bool verify_cert_chain_platform_specific(boost::asio::ssl::verify_context &verif
 }
 #endif
 
-#if defined(_MS_WINDOWS)  && !defined(__cplusplus_winrt)
+#if defined(_MS_WINDOWS)  && !defined(__cplusplus_winrt) && !defined(_M_ARM)
 
 // Helper RAII unique_ptrs to free Windows structures.
 struct cert_free_certificate_context

Release/src/websockets/client/ws_client.cpp

@@ -34,6 +34,9 @@
 #include <memory>
 #include <thread>
 
+// Force websocketpp to use C++ std::error_code instead of Boost.
+#define _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
+
 #if ((!defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) && !defined(_M_ARM) && (!defined(_MSC_VER) || (_MSC_VER < 1900))) && !defined(CPPREST_EXCLUDE_WEBSOCKETS)
 #if defined(__GNUC__)
 #include "pplx/threadpool.h"
@@ -49,7 +52,6 @@
 #undef ntohll
 #undef htonll
 #endif
-#define _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
 #include <websocketpp/config/asio_client.hpp>
 #include <websocketpp/config/asio_no_tls_client.hpp>
 #include <websocketpp/client.hpp>