Update to websocketpp 0.8.2

Author: wch

src/lib/update.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-COMMIT=0.8.1
+COMMIT=0.8.2
 
 set -e
 

src/lib/websocketpp/transport/asio/connection.hpp

@@ -311,9 +311,10 @@ class connection : public config::socket_type::socket_con_type {
      * needed.
      */
     timer_ptr set_timer(long duration, timer_handler callback) {
-        timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>(
-            lib::ref(*m_io_service),
-            lib::asio::milliseconds(duration)
+        timer_ptr new_timer(
+            new lib::asio::steady_timer(
+                *m_io_service,
+                lib::asio::milliseconds(duration))
         );
 
         if (config::enable_multithreading) {
@@ -461,8 +462,7 @@ class connection : public config::socket_type::socket_con_type {
         m_io_service = io_service;
 
         if (config::enable_multithreading) {
-            m_strand = lib::make_shared<lib::asio::io_service::strand>(
-                lib::ref(*io_service));
+            m_strand.reset(new lib::asio::io_service::strand(*io_service));
         }
 
         lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,

src/lib/websocketpp/transport/asio/endpoint.hpp

@@ -45,69 +45,6 @@ namespace ws_websocketpp {
 namespace transport {
 namespace asio {
 
-/***
- * In current versions of libstdc++, the error_constants.h code associated to mingw32
- * does not define certain standard enum values for `std::errc`. (In C++11 standard,
- * sections 19.5.2, 19.5.3.) Asio uses these for lib::asio::errc when it is compiled
- * as a stand-alone library, so because of the libstdc++ defect, code below referring
- * to lib::asio::errc::operation_canceled fails to compile on mingw.
- *
- * This workaround detects the defect using SFINAE and returns 'false' for the check
- * if operation_canceled is not defined, instead of failing to compile.
- *
- * If upstream patches this later by defining those enum values, then the workaround
- * will stop having any effect.
- *
- * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68307
- */
-namespace _workaround_gcc_libstdcpp_issue_68307_missing_values {
-/***
- * Same as std::enable_if, but don't want to introduce dependency on <type_traits>
- * since that's C++11 only
- */
-template<bool B, class T = void>
-struct enable_if {};
-
-template<class T>
-struct enable_if<true, T> { typedef T type; };
-
-/***
- * Metafunction to test "operation_canceled" value
- */
-template <typename T, typename ENABLE=void>
-struct op_canceled_helper {
-  template <typename U>
-  static inline bool is_op_canceled(const U & u) { return false; }
-};
-
-template <typename T>
-struct op_canceled_helper<T, enable_if<T::operation_canceled == T::operation_canceled, void> > {
-  template<typename U>
-  static inline bool is_op_canceled(const U & u) { return u == T::operation_canceled; }
-};
-
-/***
- * This function is intended to be a drop-in replacement for
- *   (asio_ec == lib::asio::errc::operation_canceled)
- *
- * except that if lib::asio::errc::operation_canceled does not exist, it returns false,
- * instead of failing to compile.
- *
- * When using boost and not asio standalone, then lib::asio::errc is a namespace, not an enum class.
- * So the template code will fail to compile and we need to block it from being instantiated, with this
- * ifdef. When using boost the standard library symbol definitions aren't relevant afaik.
- */
-#ifdef ASIO_STANDALONE
-static inline bool is_op_canceled(const lib::asio::error_code & asio_ec) {
-  return op_canceled_helper<lib::asio::errc, void>::is_op_canceled(asio_ec);
-}
-#else
-static inline bool is_op_canceled(const lib::asio::error_code & asio_ec) {
-  return asio_ec == lib::asio::errc::operation_canceled;
-}
-#endif
-} // namespace _workaround
-
 /// Asio based endpoint transport component
 /**
  * transport::asio::endpoint implements an endpoint transport component using
@@ -224,7 +161,7 @@ class endpoint : public config::socket_type {
             rhs.m_acceptor = NULL;
             rhs.m_listen_backlog = lib::asio::socket_base::max_connections;
             rhs.m_state = UNINITIALIZED;
-
+            
             // TODO: this needs to be updated
         }
         return *this;
@@ -258,8 +195,7 @@ class endpoint : public config::socket_type {
 
         m_io_service = ptr;
         m_external_io_service = true;
-        m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>(
-            lib::ref(*m_io_service));
+        m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service));
 
         m_state = READY;
         ec = lib::error_code();
@@ -289,7 +225,7 @@ class endpoint : public config::socket_type {
      * @param ec Set to indicate what error occurred, if any.
      */
     void init_asio(lib::error_code & ec) {
-        // Use a smart pointer until the call is successful and ownership has
+        // Use a smart pointer until the call is successful and ownership has 
         // successfully been taken. Use unique_ptr when available.
         // TODO: remove the use of auto_ptr when C++98/03 support is no longer
         //       necessary.
@@ -311,7 +247,7 @@ class endpoint : public config::socket_type {
      * @see init_asio(io_service_ptr ptr)
      */
     void init_asio() {
-        // Use a smart pointer until the call is successful and ownership has
+        // Use a smart pointer until the call is successful and ownership has 
         // successfully been taken. Use unique_ptr when available.
         // TODO: remove the use of auto_ptr when C++98/03 support is no longer
         //       necessary.
@@ -442,15 +378,15 @@ class endpoint : public config::socket_type {
     lib::asio::io_service & get_io_service() {
         return *m_io_service;
     }
-
+    
     /// Get local TCP endpoint
     /**
      * Extracts the local endpoint from the acceptor. This represents the
      * address that WebSocket++ is listening on.
      *
      * Sets a bad_descriptor error if the acceptor is not currently listening
      * or otherwise unavailable.
-     *
+     * 
      * @since 0.7.0
      *
      * @param ec Set to indicate what error occurred, if any.
@@ -489,10 +425,10 @@ class endpoint : public config::socket_type {
 
         m_acceptor->open(ep.protocol(),bec);
         if (bec) {ec = clean_up_listen_after_error(bec);return;}
-
+        
         m_acceptor->set_option(lib::asio::socket_base::reuse_address(m_reuse_addr),bec);
         if (bec) {ec = clean_up_listen_after_error(bec);return;}
-
+        
         // if a TCP pre-bind handler is present, run it
         if (m_tcp_pre_bind_handler) {
             ec = m_tcp_pre_bind_handler(m_acceptor);
@@ -501,13 +437,13 @@ class endpoint : public config::socket_type {
                 return;
             }
         }
-
+        
         m_acceptor->bind(ep,bec);
         if (bec) {ec = clean_up_listen_after_error(bec);return;}
-
+        
         m_acceptor->listen(m_listen_backlog,bec);
         if (bec) {ec = clean_up_listen_after_error(bec);return;}
-
+        
         // Success
         m_state = LISTENING;
         ec = lib::error_code();
@@ -751,9 +687,7 @@ class endpoint : public config::socket_type {
      * @since 0.3.0
      */
     void start_perpetual() {
-        m_work = lib::make_shared<lib::asio::io_service::work>(
-            lib::ref(*m_io_service)
-        );
+        m_work.reset(new lib::asio::io_service::work(*m_io_service));
     }
 
     /// Clears the endpoint's perpetual flag, allowing it to exit when empty
@@ -891,15 +825,15 @@ class endpoint : public config::socket_type {
         m_elog = e;
     }
 
-    void handle_accept(accept_handler callback, lib::asio::error_code const &
+    void handle_accept(accept_handler callback, lib::asio::error_code const & 
         asio_ec)
     {
         lib::error_code ret_ec;
 
         m_alog->write(log::alevel::devel, "asio::handle_accept");
 
         if (asio_ec) {
-            if (_workaround_gcc_libstdcpp_issue_68307_missing_values::is_op_canceled(asio_ec)) {
+            if (asio_ec == lib::asio::errc::operation_canceled) {
                 ret_ec = make_error_code(ws_websocketpp::error::operation_canceled);
             } else {
                 log_err(log::elevel::info,"asio handle_accept",asio_ec);
@@ -917,8 +851,7 @@ class endpoint : public config::socket_type {
 
         // Create a resolver
         if (!m_resolver) {
-            m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>(
-                lib::ref(*m_io_service));
+            m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service));
         }
 
         tcon->set_uri(u);

src/lib/websocketpp/transport/asio/security/none.hpp

@@ -168,8 +168,7 @@ class connection : public lib::enable_shared_from_this<connection> {
             return socket::make_error_code(socket::error::invalid_state);
         }
 
-        m_socket = lib::make_shared<lib::asio::ip::tcp::socket>(
-            lib::ref(*service));
+        m_socket.reset(new lib::asio::ip::tcp::socket(*service));
 
         if (m_socket_init_handler) {
             m_socket_init_handler(m_hdl, *m_socket);

src/lib/websocketpp/transport/asio/security/tls.hpp

@@ -193,8 +193,7 @@ class connection : public lib::enable_shared_from_this<connection> {
         if (!m_context) {
             return socket::make_error_code(socket::error::invalid_tls_context);
         }
-        m_socket = lib::make_shared<socket_type>(
-            _WEBSOCKETPP_REF(*service),lib::ref(*m_context));
+        m_socket.reset(new socket_type(*service, *m_context));
 
         if (m_socket_init_handler) {
             m_socket_init_handler(m_hdl, get_socket());

src/lib/websocketpp/version.hpp

@@ -44,7 +44,7 @@ static int const major_version = 0;
 /// Library minor version number
 static int const minor_version = 8;
 /// Library patch version number
-static int const patch_version = 1;
+static int const patch_version = 2;
 /// Library pre-release flag
 /**
  * This is a textual flag indicating the type and number for pre-release
@@ -54,7 +54,7 @@ static int const patch_version = 1;
 static char const prerelease_flag[] = "";
 
 /// Default user agent string
-static char const user_agent[] = "WebSocket++/0.8.1";
+static char const user_agent[] = "WebSocket++/0.8.2";
 
 } // namespace ws_websocketpp