Various micro perf fixes and cleanup found while implementing CN overrides so far

Release/include/cpprest/details/basic_types.h

@@ -50,6 +50,7 @@ typedef uint32_t HRESULT; // Needed for PPLX
 typedef wchar_t char_t ;
 typedef std::wstring string_t;
 #define _XPLATSTR(x) L ## x
+#define _XPLATTOSTR(x) std::to_wstring(x)
 typedef std::wostringstream ostringstream_t;
 typedef std::wofstream ofstream_t;
 typedef std::wostream ostream_t;
@@ -67,6 +68,7 @@ typedef std::wstringstream stringstream_t;
 typedef char char_t;
 typedef std::string string_t;
 #define _XPLATSTR(x) x
+#define _XPLATTOSTR(x) std::to_string(x)
 typedef std::ostringstream ostringstream_t;
 typedef std::ofstream ofstream_t;
 typedef std::ostream ostream_t;

Release/include/cpprest/details/web_utilities.h

@@ -14,17 +14,6 @@
 
 namespace web
 {
-
-namespace http { namespace client { namespace details {
-class winhttp_client;
-class winrt_client;
-class asio_context;
-}}}
-namespace websockets { namespace client { namespace details {
-class winrt_callback_client;
-class wspp_callback_client;
-}}}
-
 namespace details
 {
 

Release/include/cpprest/streams.h

@@ -1748,7 +1748,7 @@ class type_parser<CharType, std::enable_if_t<sizeof(CharType) == 1, std::basic_s
 
     static pplx::task<std::wstring> parse(streams::streambuf<CharType> buffer)
     {
-        return base::_parse_input<std::basic_string<char>,std::basic_string<wchar_t>>(buffer, _accept_char, _extract_result);
+        return base::template _parse_input<std::basic_string<char>,std::basic_string<wchar_t>>(buffer, _accept_char, _extract_result);
     }
 
 private:

Release/libs/websocketpp/examples/broadcast_server/broadcast_server.cpp

@@ -19,6 +19,7 @@ using websocketpp::lib::bind;
 
 using websocketpp::lib::thread;
 using websocketpp::lib::mutex;
+using websocketpp::lib::lock_guard;
 using websocketpp::lib::unique_lock;
 using websocketpp::lib::condition_variable;
 
@@ -71,27 +72,30 @@ class broadcast_server {
     }
 
     void on_open(connection_hdl hdl) {
-        unique_lock<mutex> lock(m_action_lock);
-        //std::cout << "on_open" << std::endl;
-        m_actions.push(action(SUBSCRIBE,hdl));
-        lock.unlock();
+        {
+            lock_guard<mutex> lock(m_action_lock);
+            //std::cout << "on_open" << std::endl;
+            m_actions.push(action(SUBSCRIBE,hdl));
+        } // unlock
         m_action_cond.notify_one();
     }
 
     void on_close(connection_hdl hdl) {
-        unique_lock<mutex> lock(m_action_lock);
-        //std::cout << "on_close" << std::endl;
-        m_actions.push(action(UNSUBSCRIBE,hdl));
-        lock.unlock();
+        {
+            lock_guard<mutex> lock(m_action_lock);
+            //std::cout << "on_close" << std::endl;
+            m_actions.push(action(UNSUBSCRIBE,hdl));
+        } // unlock
         m_action_cond.notify_one();
     }
 
     void on_message(connection_hdl hdl, server::message_ptr msg) {
         // queue message up for sending by processing thread
-        unique_lock<mutex> lock(m_action_lock);
-        //std::cout << "on_message" << std::endl;
-        m_actions.push(action(MESSAGE,hdl,msg));
-        lock.unlock();
+        {
+            lock_guard<mutex> lock(m_action_lock);
+            //std::cout << "on_message" << std::endl;
+            m_actions.push(action(MESSAGE,hdl,msg));
+        } // unlock
         m_action_cond.notify_one();
     }
 
@@ -109,13 +113,13 @@ class broadcast_server {
             lock.unlock();
 
             if (a.type == SUBSCRIBE) {
-                unique_lock<mutex> con_lock(m_connection_lock);
+                lock_guard<mutex> con_lock(m_connection_lock);
                 m_connections.insert(a.hdl);
             } else if (a.type == UNSUBSCRIBE) {
-                unique_lock<mutex> con_lock(m_connection_lock);
+                lock_guard<mutex> con_lock(m_connection_lock);
                 m_connections.erase(a.hdl);
             } else if (a.type == MESSAGE) {
-                unique_lock<mutex> con_lock(m_connection_lock);
+                lock_guard<mutex> con_lock(m_connection_lock);
 
                 con_list::iterator it;
                 for (it = m_connections.begin(); it != m_connections.end(); ++it) {