Fixing up a call non standard std::exception constructor with string and other misc websocket exception constructor calls.

Author: stgates

Release/include/cpprest/ws_client.h

@@ -176,11 +176,13 @@ class websocket_exception : public std::exception
     websocket_exception(const utility::string_t &whatArg) 
         : m_msg(utility::conversions::to_utf8string(whatArg)) {}
 
+#ifdef _MS_WINDOWS
     /// <summary>
     /// Creates an <c>websocket_exception</c> with just a string message and no error code.
     /// </summary>
     /// <param name="whatArg">Error message string.</param>
     websocket_exception(std::string whatArg) : m_msg(std::move(whatArg)) {}
+#endif
 
     /// <summary>
     /// Creates a <c>websocket_exception</c> from a error code using the current platform error category.
@@ -203,6 +205,7 @@ class websocket_exception : public std::exception
           m_msg(utility::conversions::to_utf8string(whatArg))
     {}
 
+#ifdef _MS_WINDOWS
     /// <summary>
     /// Creates a <c>websocket_exception</c> from a error code and string message.
     /// </summary>
@@ -212,6 +215,7 @@ class websocket_exception : public std::exception
         : m_errorCode(utility::details::create_error_code(errorCode)),
         m_msg(std::move(whatArg))
     {}
+#endif
 
     /// <summary>
     /// Creates a <c>websocket_exception</c> from a error code and category. The message of the error code will be used

Release/src/websockets/client/ws_client.cpp

@@ -170,8 +170,7 @@ class ws_desktop_client : public _websocket_client_impl, public std::enable_shar
             m_client.close(m_con, static_cast<websocketpp::close::status::value>(status), utility::conversions::to_utf8string(reason), ec);
             if (ec.value() != 0)
             {
-                websocket_exception wx(utility::conversions::to_string_t(ec.message()));
-                return pplx::task_from_exception<void>(wx);
+                return pplx::task_from_exception<void>(ec.message());
             }
         }
         return pplx::task<void>(m_close_tce);
@@ -195,7 +194,7 @@ class ws_desktop_client : public _websocket_client_impl, public std::enable_shar
             std::lock_guard<std::mutex> lock(m_receive_queue_lock);
             close_pending_tasks_with_error();
             m_state = CLOSED;
-            m_connect_tce.set_exception(websocket_exception(_XPLATSTR("Connection attempt failed.")));
+            m_connect_tce.set_exception(websocket_exception("Connection attempt failed."));
         });
 
         m_client.set_message_handler([this](websocketpp::connection_hdl, message_ptr msg)
@@ -324,7 +323,7 @@ class ws_desktop_client : public _websocket_client_impl, public std::enable_shar
     {
         if (!m_connect_tce._IsTriggered())
         {
-            return pplx::task_from_exception<void>(websocket_exception(_XPLATSTR("Client not connected.")));
+            return pplx::task_from_exception<void>(websocket_exception("Client not connected."));
         }
 
         switch (msg._m_impl->message_type())
@@ -333,18 +332,18 @@ class ws_desktop_client : public _websocket_client_impl, public std::enable_shar
         case websocket_message_type::binary_message:
             break;
         default:
-            return pplx::task_from_exception<void>(websocket_exception(_XPLATSTR("Invalid message type")));
+            return pplx::task_from_exception<void>(websocket_exception("Invalid message type"));
         }
 
         const auto length = msg._m_impl->length();
         if (length == 0)
         {
-            return pplx::task_from_exception<void>(websocket_exception(_XPLATSTR("Cannot send empty message.")));
+            return pplx::task_from_exception<void>(websocket_exception("Cannot send empty message."));
         }
 
         if (length > UINT_MAX)
         {
-            return pplx::task_from_exception<void>(websocket_exception(_XPLATSTR("Message size too large. Ensure message length is less than or equal to UINT_MAX.")));
+            return pplx::task_from_exception<void>(websocket_exception("Message size too large. Ensure message length is less than or equal to UINT_MAX."));
         }
 
         {
@@ -370,7 +369,7 @@ class ws_desktop_client : public _websocket_client_impl, public std::enable_shar
         if (m_state > CONNECTED)
         {
             // The client has already been closed.
-            return pplx::task_from_exception<websocket_incoming_message>(std::make_exception_ptr(websocket_exception(_XPLATSTR("Websocket connection has closed."))));
+            return pplx::task_from_exception<websocket_incoming_message>(std::make_exception_ptr(websocket_exception("Websocket connection has closed.")));
         }
 
         if (m_receive_msg_queue.empty())
@@ -421,7 +420,7 @@ class ws_desktop_client : public _websocket_client_impl, public std::enable_shar
             {
                 if (bytes_read != length)
                 {
-                    throw websocket_exception(_XPLATSTR("Failed to read required length of data from the stream."));
+                    throw websocket_exception("Failed to read required length of data from the stream.");
                 }
             });
         }
@@ -509,7 +508,7 @@ class ws_desktop_client : public _websocket_client_impl, public std::enable_shar
             // There are tasks waiting to receive a message, signal them
             auto tce = m_receive_task_queue.front();
             m_receive_task_queue.pop();
-            tce.set_exception(std::make_exception_ptr(websocket_exception(_XPLATSTR("Websocket connection has been closed."))));
+            tce.set_exception(std::make_exception_ptr(websocket_exception("Websocket connection has been closed.")));
         }
     }
 

Release/src/websockets/client/ws_msg.cpp

@@ -104,7 +104,7 @@ pplx::task<std::string> websocket_incoming_message::extract_string() const
 {
     if (_m_impl->message_type() == websocket_message_type::binary_message)
     {
-        return pplx::task_from_exception<std::string>(websocket_exception(_XPLATSTR("Invalid message type")));
+        return pplx::task_from_exception<std::string>(websocket_exception("Invalid message type"));
     }
 
     auto m_impl = _m_impl;
@@ -114,4 +114,4 @@ pplx::task<std::string> websocket_incoming_message::extract_string() const
 
 }}}}
 #endif  //  _NOT_PHONE8_
-#endif
+#endif

Release/tests/Functional/websockets/utilities/test_websocket_server.cpp

@@ -87,11 +87,11 @@ namespace utilities {
 
         const std::string& username() override
         {
-            throw std::exception("NYI");
+            throw std::runtime_error("NYI");
         }
         const std::string& password() override
         {
-            throw std::exception("NYI");
+            throw std::runtime_error("NYI");
         }
 
         const std::string& get_header_val(const std::string& header_name) override