Moving websocket_client out of the experimental namespace.

Author: stgates

Release/include/cpprest/web_utilities.h

@@ -37,9 +37,9 @@ namespace http { namespace client { namespace details {
 class winhttp_client;
 class winrt_client;
 }}}
-namespace experimental { namespace websockets { namespace client { namespace details {
+namespace websockets { namespace client { namespace details {
 class winrt_client;
-}}}}
+}}}
 
 namespace details
 {
@@ -139,7 +139,7 @@ class credentials
 private:
     friend class http::client::details::winhttp_client;
     friend class http::client::details::winrt_client;
-    friend class experimental::websockets::client::details::winrt_client;
+    friend class websockets::client::details::winrt_client;
 
 #if defined(_MS_WINDOWS)
     details::plaintext_string decrypt() const

Release/include/cpprest/ws_client.h

@@ -53,12 +53,15 @@ namespace pplx = Concurrency;
 
 namespace web
 {
-/// WebSocket client is currently in beta.
-namespace experimental
-{
+
+// For backwards compatibility for when in the experimental namespace.
+// At next major release this should be deleted.
+namespace experimental = web;
+
 // In the past namespace was accidentally called 'web_sockets'. To avoid breaking code
 // alias it. At our next major release this should be deleted.
 namespace web_sockets = websockets;
+
 namespace websockets
 {
 /// WebSocket client side library.
@@ -469,7 +472,7 @@ class websocket_client
     std::shared_ptr<details::_websocket_client_impl> m_client;
 };
 
-}}}}
+}}}
 
 #endif
 #endif  /* _CASA_WS_CLIENT_H */

Release/include/cpprest/ws_msg.h

@@ -48,8 +48,6 @@ namespace pplx = Concurrency;
 
 namespace web
 {
-namespace experimental
-{
 namespace websockets
 {
 namespace client
@@ -277,7 +275,7 @@ class websocket_incoming_message
     std::shared_ptr<details::_websocket_message> _m_impl;
 };
 
-}}}}
+}}}
 
 #endif
 #endif  /* _CASA_WS_MSG_H */

Release/src/websockets/client/ws_client.cpp

@@ -83,8 +83,6 @@ using websocketpp::lib::bind;
 
 namespace web
 {
-namespace experimental
-{
 namespace websockets
 {
 namespace client
@@ -750,6 +748,6 @@ websocket_client::websocket_client(websocket_client_config config) :
     m_client(std::make_shared<details::wspp_client>(std::move(config)))
 {}
 
-}}}}
+}}}
 
 #endif // !defined(WINAPI_FAMILY) || WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

Release/src/websockets/client/ws_msg.cpp

@@ -38,8 +38,6 @@ using namespace concurrency::streams::details;
 
 namespace web
 {
-namespace experimental
-{
 namespace websockets
 {
 namespace client
@@ -80,6 +78,6 @@ pplx::task<std::string> websocket_incoming_message::extract_string() const
     return pplx::task_from_result(std::move(m_body.collection()));
 }
 
-}}}}
+}}}
 
 #endif

Release/src/websockets/client/ws_winrt.cpp

@@ -39,8 +39,6 @@ using namespace Concurrency::streams::details;
 
 namespace web
 {
-namespace experimental
-{
 namespace websockets
 {
 namespace client
@@ -516,5 +514,5 @@ websocket_client::websocket_client(websocket_client_config config) :
     m_client(std::make_shared<details::winrt_client>(std::move(config)))
 {}
 
-}}}}
+}}}
 #endif /* WINAPI_FAMILY == WINAPI_FAMILY_APP */

Release/tests/functional/websockets/client/authentication_tests.cpp

@@ -27,8 +27,8 @@
 
 #if defined(__cplusplus_winrt) || !defined(_M_ARM)
 
-using namespace web::experimental::websockets;
-using namespace web::experimental::websockets::client;
+using namespace web::websockets;
+using namespace web::websockets::client;
 
 using namespace tests::functional::websocket::utilities;
 

Release/tests/functional/websockets/client/client_construction.cpp

@@ -30,8 +30,8 @@
 using namespace concurrency::streams;
 
 using namespace web;
-using namespace web::experimental::websockets;
-using namespace web::experimental::websockets::client;
+using namespace web::websockets;
+using namespace web::websockets::client;
 
 using namespace tests::functional::websocket::utilities;
 

Release/tests/functional/websockets/client/close_tests.cpp

@@ -29,8 +29,8 @@
 
 using namespace concurrency::streams;
 
-using namespace web::experimental::websockets;
-using namespace web::experimental::websockets::client;
+using namespace web::websockets;
+using namespace web::websockets::client;
 
 using namespace tests::functional::websocket::utilities;
 

Release/tests/functional/websockets/client/error_tests.cpp

@@ -29,8 +29,8 @@
 
 using namespace concurrency::streams;
 
-using namespace web::experimental::websockets;
-using namespace web::experimental::websockets::client;
+using namespace web::websockets;
+using namespace web::websockets::client;
 
 using namespace tests::functional::websocket::utilities;