nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

update wspp version from 0.8.1 to 0.8.2

Browse Source
This commit is contained in:
briaguya
2025-05-07 17:33:40 -04:00
parent 05e9696ca0
commit 5040201a03
6 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
subprojects/websocketpp/websocketpp/common/thread.hpp
View File

@@ -36,7 +36,7 @@
#if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_THREAD_ #if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_THREAD_
// MinGW by default does not support C++11 thread/mutex so even if the // MinGW by default does not support C++11 thread/mutex so even if the
// internal check for C++11 passes, ignore it if we are on MinGW // internal check for C++11 passes, ignore it if we are on MinGW
#if (!defined(__MINGW32__) && !defined(__MINGW64__)) || __MINGW64_VERSION_MAJOR>=6 #if (!defined(__MINGW32__) && !defined(__MINGW64__))
#ifndef _WEBSOCKETPP_CPP11_THREAD_ #ifndef _WEBSOCKETPP_CPP11_THREAD_
#define _WEBSOCKETPP_CPP11_THREAD_ #define _WEBSOCKETPP_CPP11_THREAD_
#endif #endif

10
subprojects/websocketpp/websocketpp/transport/asio/connection.hpp
View File

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

10
subprojects/websocketpp/websocketpp/transport/asio/endpoint.hpp
View File

@@ -195,8 +195,7 @@ public:
m_io_service = ptr; m_io_service = ptr;
m_external_io_service = true; m_external_io_service = true;
m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>( m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service));
lib::ref(*m_io_service));
m_state = READY; m_state = READY;
ec = lib::error_code(); ec = lib::error_code();
@@ -688,9 +687,7 @@ public:
* @since 0.3.0 * @since 0.3.0
*/ */
void start_perpetual() { void start_perpetual() {
m_work = lib::make_shared<lib::asio::io_service::work>( m_work.reset(new lib::asio::io_service::work(*m_io_service));
lib::ref(*m_io_service)
);
} }
/// Clears the endpoint's perpetual flag, allowing it to exit when empty /// Clears the endpoint's perpetual flag, allowing it to exit when empty
@@ -854,8 +851,7 @@ protected:
// Create a resolver // Create a resolver
if (!m_resolver) { if (!m_resolver) {
m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>( m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service));
lib::ref(*m_io_service));
} }
tcon->set_uri(u); tcon->set_uri(u);

3
subprojects/websocketpp/websocketpp/transport/asio/security/none.hpp
View File

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

3
subprojects/websocketpp/websocketpp/transport/asio/security/tls.hpp
View File

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

4
subprojects/websocketpp/websocketpp/version.hpp
View File

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