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

manually apply cpp20 fixes from https://github.com/zaphoyd/websocketpp/pull/1060

Browse Source 
the patch link from  https://github.com/zaphoyd/websocketpp/issues/1068#issuecomment-1364647094 didn't work for some reason, so i looked at the 1060 PR

the PR had 10 commits https://github.com/zaphoyd/websocketpp/pull/1060/commits, all but 2 of which seemed entirely unrelated to the cpp20 fix

so i manually pulled the changes from the 2 cpp 20 related commits:
* 9b7fdd5b98
* 0823cfea38

Co-authored-by: Andre Azevedo <andre.azevedo@gmail.com>
This commit is contained in:
briaguya
2025-05-07 18:10:30 -04:00
parent 5040201a03
commit 00ac813735
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
subprojects/websocketpp/websocketpp/endpoint.hpp
View File

@@ -109,7 +109,7 @@ public:
/// Destructor /// Destructor
~endpoint<connection,config>() {} ~endpoint() {}
#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
// no copy constructor because endpoints are not copyable // no copy constructor because endpoints are not copyable

14
subprojects/websocketpp/websocketpp/logger/basic.hpp
View File

@@ -58,33 +58,33 @@ namespace log {
template <typename concurrency, typename names> template <typename concurrency, typename names>
class basic { class basic {
public: public:
basic<concurrency,names>(channel_type_hint::value h = basic(channel_type_hint::value h =
channel_type_hint::access) channel_type_hint::access)
: m_static_channels(0xffffffff) : m_static_channels(0xffffffff)
, m_dynamic_channels(0) , m_dynamic_channels(0)
, m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {} , m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {}
basic<concurrency,names>(std::ostream * out) basic(std::ostream * out)
: m_static_channels(0xffffffff) : m_static_channels(0xffffffff)
, m_dynamic_channels(0) , m_dynamic_channels(0)
, m_out(out) {} , m_out(out) {}
basic<concurrency,names>(level c, channel_type_hint::value h = basic(level c, channel_type_hint::value h =
channel_type_hint::access) channel_type_hint::access)
: m_static_channels(c) : m_static_channels(c)
, m_dynamic_channels(0) , m_dynamic_channels(0)
, m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {} , m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {}
basic<concurrency,names>(level c, std::ostream * out) basic(level c, std::ostream * out)
: m_static_channels(c) : m_static_channels(c)
, m_dynamic_channels(0) , m_dynamic_channels(0)
, m_out(out) {} , m_out(out) {}
/// Destructor /// Destructor
~basic<concurrency,names>() {} ~basic() {}
/// Copy constructor /// Copy constructor
basic<concurrency,names>(basic<concurrency,names> const & other) basic(basic<concurrency,names> const & other)
: m_static_channels(other.m_static_channels) : m_static_channels(other.m_static_channels)
, m_dynamic_channels(other.m_dynamic_channels) , m_dynamic_channels(other.m_dynamic_channels)
, m_out(other.m_out) , m_out(other.m_out)
@@ -97,7 +97,7 @@ public:
#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_ #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
/// Move constructor /// Move constructor
basic<concurrency,names>(basic<concurrency,names> && other) basic(basic<concurrency,names> && other)
: m_static_channels(other.m_static_channels) : m_static_channels(other.m_static_channels)
, m_dynamic_channels(other.m_dynamic_channels) , m_dynamic_channels(other.m_dynamic_channels)
, m_out(other.m_out) , m_out(other.m_out)

6
subprojects/websocketpp/websocketpp/roles/server_endpoint.hpp
View File

@@ -72,11 +72,11 @@ public:
} }
/// Destructor /// Destructor
~server<config>() {} ~server() {}
#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
// no copy constructor because endpoints are not copyable // no copy constructor because endpoints are not copyable
server<config>(server<config> &) = delete; server(server<config> &) = delete;
// no copy assignment operator because endpoints are not copyable // no copy assignment operator because endpoints are not copyable
server<config> & operator=(server<config> const &) = delete; server<config> & operator=(server<config> const &) = delete;
@@ -84,7 +84,7 @@ public:
#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_ #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
/// Move constructor /// Move constructor
server<config>(server<config> && o) : endpoint<connection<config>,config>(std::move(o)) {} server(server<config> && o) : endpoint<connection<config>,config>(std::move(o)) {}
#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
// no move assignment operator because of const member variables // no move assignment operator because of const member variables