Ravago Jones | 0c74c12 | 2023-01-08 15:20:19 -0800 | [diff] [blame^] | 1 | diff --git a/websocketpp/endpoint.hpp b/websocketpp/endpoint.hpp |
| 2 | index c124b1d..177bda6 100644 |
| 3 | --- a/websocketpp/endpoint.hpp |
| 4 | +++ b/websocketpp/endpoint.hpp |
| 5 | @@ -109,26 +109,26 @@ public: |
| 6 | |
| 7 | |
| 8 | /// Destructor |
| 9 | - ~endpoint<connection,config>() {} |
| 10 | + ~endpoint() {} |
| 11 | |
| 12 | #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ |
| 13 | // no copy constructor because endpoints are not copyable |
| 14 | endpoint(endpoint &) = delete; |
| 15 | - |
| 16 | + |
| 17 | // no copy assignment operator because endpoints are not copyable |
| 18 | endpoint & operator=(endpoint const &) = delete; |
| 19 | #endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ |
| 20 | |
| 21 | #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_ |
| 22 | /// Move constructor |
| 23 | - endpoint(endpoint && o) |
| 24 | + endpoint(endpoint && o) |
| 25 | : config::transport_type(std::move(o)) |
| 26 | , config::endpoint_base(std::move(o)) |
| 27 | , m_alog(std::move(o.m_alog)) |
| 28 | , m_elog(std::move(o.m_elog)) |
| 29 | , m_user_agent(std::move(o.m_user_agent)) |
| 30 | , m_open_handler(std::move(o.m_open_handler)) |
| 31 | - |
| 32 | + |
| 33 | , m_close_handler(std::move(o.m_close_handler)) |
| 34 | , m_fail_handler(std::move(o.m_fail_handler)) |
| 35 | , m_ping_handler(std::move(o.m_ping_handler)) |
| 36 | @@ -146,7 +146,7 @@ public: |
| 37 | , m_max_http_body_size(o.m_max_http_body_size) |
| 38 | |
| 39 | , m_rng(std::move(o.m_rng)) |
| 40 | - , m_is_server(o.m_is_server) |
| 41 | + , m_is_server(o.m_is_server) |
| 42 | {} |
| 43 | |
| 44 | #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ |
| 45 | @@ -403,9 +403,9 @@ public: |
| 46 | |
| 47 | /// Get default maximum message size |
| 48 | /** |
| 49 | - * Get the default maximum message size that will be used for new |
| 50 | + * Get the default maximum message size that will be used for new |
| 51 | * connections created by this endpoint. The maximum message size determines |
| 52 | - * the point at which the connection will fail a connection with the |
| 53 | + * the point at which the connection will fail a connection with the |
| 54 | * message_too_big protocol error. |
| 55 | * |
| 56 | * The default is set by the max_message_size value from the template config |
| 57 | @@ -415,10 +415,10 @@ public: |
| 58 | size_t get_max_message_size() const { |
| 59 | return m_max_message_size; |
| 60 | } |
| 61 | - |
| 62 | + |
| 63 | /// Set default maximum message size |
| 64 | /** |
| 65 | - * Set the default maximum message size that will be used for new |
| 66 | + * Set the default maximum message size that will be used for new |
| 67 | * connections created by this endpoint. Maximum message size determines the |
| 68 | * point at which the connection will fail a connection with the |
| 69 | * message_too_big protocol error. |
| 70 | @@ -449,7 +449,7 @@ public: |
| 71 | size_t get_max_http_body_size() const { |
| 72 | return m_max_http_body_size; |
| 73 | } |
| 74 | - |
| 75 | + |
| 76 | /// Set maximum HTTP message body size |
| 77 | /** |
| 78 | * Set maximum HTTP message body size. Maximum message body size determines |
| 79 | @@ -484,32 +484,32 @@ public: |
| 80 | |
| 81 | /// Pause reading of new data (exception free) |
| 82 | /** |
| 83 | - * Signals to the connection to halt reading of new data. While reading is |
| 84 | + * Signals to the connection to halt reading of new data. While reading is |
| 85 | * paused, the connection will stop reading from its associated socket. In |
| 86 | * turn this will result in TCP based flow control kicking in and slowing |
| 87 | * data flow from the remote endpoint. |
| 88 | * |
| 89 | - * This is useful for applications that push new requests to a queue to be |
| 90 | + * This is useful for applications that push new requests to a queue to be |
| 91 | * processed by another thread and need a way to signal when their request |
| 92 | * queue is full without blocking the network processing thread. |
| 93 | * |
| 94 | * Use `resume_reading()` to resume. |
| 95 | * |
| 96 | * If supported by the transport this is done asynchronously. As such |
| 97 | - * reading may not stop until the current read operation completes. |
| 98 | + * reading may not stop until the current read operation completes. |
| 99 | * Typically you can expect to receive no more bytes after initiating a read |
| 100 | * pause than the size of the read buffer. |
| 101 | * |
| 102 | * If reading is paused for this connection already nothing is changed. |
| 103 | */ |
| 104 | void pause_reading(connection_hdl hdl, lib::error_code & ec); |
| 105 | - |
| 106 | + |
| 107 | /// Pause reading of new data |
| 108 | void pause_reading(connection_hdl hdl); |
| 109 | |
| 110 | /// Resume reading of new data (exception free) |
| 111 | /** |
| 112 | - * Signals to the connection to resume reading of new data after it was |
| 113 | + * Signals to the connection to resume reading of new data after it was |
| 114 | * paused by `pause_reading()`. |
| 115 | * |
| 116 | * If reading is not paused for this connection already nothing is changed. |
| 117 | @@ -533,7 +533,7 @@ public: |
| 118 | * @param ec A status code, zero on success, non-zero otherwise |
| 119 | */ |
| 120 | void send_http_response(connection_hdl hdl, lib::error_code & ec); |
| 121 | - |
| 122 | + |
| 123 | /// Send deferred HTTP Response (exception free) |
| 124 | /** |
| 125 | * Sends an http response to an HTTP connection that was deferred. This will |
| 126 | diff --git a/websocketpp/logger/basic.hpp b/websocketpp/logger/basic.hpp |
| 127 | index 8451413..7dd8684 100644 |
| 128 | --- a/websocketpp/logger/basic.hpp |
| 129 | +++ b/websocketpp/logger/basic.hpp |
| 130 | @@ -58,46 +58,46 @@ namespace log { |
| 131 | template <typename concurrency, typename names> |
| 132 | class basic { |
| 133 | public: |
| 134 | - basic<concurrency,names>(channel_type_hint::value h = |
| 135 | + basic(channel_type_hint::value h = |
| 136 | channel_type_hint::access) |
| 137 | : m_static_channels(0xffffffff) |
| 138 | , m_dynamic_channels(0) |
| 139 | , m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {} |
| 140 | |
| 141 | - basic<concurrency,names>(std::ostream * out) |
| 142 | + basic(std::ostream * out) |
| 143 | : m_static_channels(0xffffffff) |
| 144 | , m_dynamic_channels(0) |
| 145 | , m_out(out) {} |
| 146 | |
| 147 | - basic<concurrency,names>(level c, channel_type_hint::value h = |
| 148 | + basic(level c, channel_type_hint::value h = |
| 149 | channel_type_hint::access) |
| 150 | : m_static_channels(c) |
| 151 | , m_dynamic_channels(0) |
| 152 | , m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {} |
| 153 | |
| 154 | - basic<concurrency,names>(level c, std::ostream * out) |
| 155 | + basic(level c, std::ostream * out) |
| 156 | : m_static_channels(c) |
| 157 | , m_dynamic_channels(0) |
| 158 | , m_out(out) {} |
| 159 | |
| 160 | /// Destructor |
| 161 | - ~basic<concurrency,names>() {} |
| 162 | + ~basic() {} |
| 163 | |
| 164 | /// Copy constructor |
| 165 | - basic<concurrency,names>(basic<concurrency,names> const & other) |
| 166 | + basic(basic<concurrency,names> const & other) |
| 167 | : m_static_channels(other.m_static_channels) |
| 168 | , m_dynamic_channels(other.m_dynamic_channels) |
| 169 | , m_out(other.m_out) |
| 170 | {} |
| 171 | - |
| 172 | + |
| 173 | #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ |
| 174 | // no copy assignment operator because of const member variables |
| 175 | - basic<concurrency,names> & operator=(basic<concurrency,names> const &) = delete; |
| 176 | + basic & operator=(basic<concurrency,names> const &) = delete; |
| 177 | #endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ |
| 178 | |
| 179 | #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_ |
| 180 | /// Move constructor |
| 181 | - basic<concurrency,names>(basic<concurrency,names> && other) |
| 182 | + basic(basic<concurrency,names> && other) |
| 183 | : m_static_channels(other.m_static_channels) |
| 184 | , m_dynamic_channels(other.m_dynamic_channels) |
| 185 | , m_out(other.m_out) |
| 186 | @@ -105,7 +105,7 @@ public: |
| 187 | |
| 188 | #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ |
| 189 | // no move assignment operator because of const member variables |
| 190 | - basic<concurrency,names> & operator=(basic<concurrency,names> &&) = delete; |
| 191 | + basic & operator=(basic<concurrency,names> &&) = delete; |
| 192 | #endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ |
| 193 | |
| 194 | #endif // _WEBSOCKETPP_MOVE_SEMANTICS_ |
| 195 | diff --git a/websocketpp/roles/server_endpoint.hpp b/websocketpp/roles/server_endpoint.hpp |
| 196 | index 9cc652f..a96471b 100644 |
| 197 | --- a/websocketpp/roles/server_endpoint.hpp |
| 198 | +++ b/websocketpp/roles/server_endpoint.hpp |
| 199 | @@ -72,23 +72,23 @@ public: |
| 200 | } |
| 201 | |
| 202 | /// Destructor |
| 203 | - ~server<config>() {} |
| 204 | + ~server() {} |
| 205 | |
| 206 | #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ |
| 207 | // no copy constructor because endpoints are not copyable |
| 208 | - server<config>(server<config> &) = delete; |
| 209 | + server(server<config> &) = delete; |
| 210 | |
| 211 | // no copy assignment operator because endpoints are not copyable |
| 212 | - server<config> & operator=(server<config> const &) = delete; |
| 213 | + server & operator=(server<config> const &) = delete; |
| 214 | #endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ |
| 215 | |
| 216 | #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_ |
| 217 | /// Move constructor |
| 218 | - server<config>(server<config> && o) : endpoint<connection<config>,config>(std::move(o)) {} |
| 219 | + server(server<config> && o) : endpoint<connection<config>,config>(std::move(o)) {} |
| 220 | |
| 221 | #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ |
| 222 | // no move assignment operator because of const member variables |
| 223 | - server<config> & operator=(server<config> &&) = delete; |
| 224 | + server & operator=(server<config> &&) = delete; |
| 225 | #endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ |
| 226 | |
| 227 | #endif // _WEBSOCKETPP_MOVE_SEMANTICS_ |
| 228 | @@ -123,7 +123,7 @@ public: |
| 229 | ec = error::make_error_code(error::async_accept_not_listening); |
| 230 | return; |
| 231 | } |
| 232 | - |
| 233 | + |
| 234 | ec = lib::error_code(); |
| 235 | connection_ptr con = get_connection(); |
| 236 | |