Merge branch 'development' of https://git01.codeplex.com/casablanca into websocket_cert

Author: stgates

Release/include/cpprest/ws_client.h

@@ -379,7 +379,7 @@ class websocket_client
     /// <summary>
     ///  Creates a new websocket_client.
     /// </summary>
-    websocket_client() : websocket_client(websocket_client_config()) {}
+    _ASYNCRTIMP websocket_client();
 
     /// <summary>
     ///  Creates a new websocket_client.

Release/src/websockets/client/ws_client.cpp

@@ -720,6 +720,10 @@ class wspp_client : public _websocket_client_impl, public std::enable_shared_fro
 
 }
 
+websocket_client::websocket_client() :
+    m_client(std::make_shared<details::wspp_client>(websocket_client_config()))
+{}
+
 websocket_client::websocket_client(websocket_client_config config) :
     m_client(std::make_shared<details::wspp_client>(std::move(config)))
 {}

Release/src/websockets/client/ws_winrt.cpp

@@ -507,8 +507,12 @@ void ReceiveContext::OnClosed(IWebSocket^ sender, WebSocketClosedEventArgs^ args
 }
 }
 
+websocket_client::websocket_client() :
+    m_client(std::make_shared<details::winrt_client>(websocket_client_config()))
+{}
+
 websocket_client::websocket_client(websocket_client_config config) :
-    m_client(std::make_shared<details::ws_winrt_client>(std::move(config)))
+    m_client(std::make_shared<details::winrt_client>(std::move(config)))
 {}
 
 }}}}