Patching websocketpp for cxx20 support (#23669)

This commit is contained in:
HrOokami 2022-03-21 23:23:49 +03:00 committed by GitHub
parent 470620d23a
commit 744f50c03b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 75 additions and 2 deletions

View File

@ -0,0 +1,66 @@
diff --git "a/websocketpp/endpoint.hpp" "b/websocketpp/endpoint.hpp"
index c124b1d..9ce8a62 100644
--- "a/websocketpp/endpoint.hpp"
+++ "b/websocketpp/endpoint.hpp"
@@ -109,7 +109,7 @@ public:
/// Destructor
- ~endpoint<connection,config>() {}
+ ~endpoint() {}
#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
// no copy constructor because endpoints are not copyable
diff --git "a/websocketpp/logger/basic.hpp" "b/websocketpp/logger/basic.hpp"
index 8451413..4c9d836 100644
--- "a/websocketpp/logger/basic.hpp"
+++ "b/websocketpp/logger/basic.hpp"
@@ -58,33 +58,33 @@ namespace log {
template <typename concurrency, typename names>
class basic {
public:
- basic<concurrency,names>(channel_type_hint::value h =
+ basic(channel_type_hint::value h =
channel_type_hint::access)
: m_static_channels(0xffffffff)
, m_dynamic_channels(0)
, 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_dynamic_channels(0)
, 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)
: m_static_channels(c)
, m_dynamic_channels(0)
, 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_dynamic_channels(0)
, m_out(out) {}
/// Destructor
- ~basic<concurrency,names>() {}
+ ~basic() {}
/// Copy constructor
- basic<concurrency,names>(basic<concurrency,names> const & other)
+ basic(basic<concurrency,names> const & other)
: m_static_channels(other.m_static_channels)
, m_dynamic_channels(other.m_dynamic_channels)
, m_out(other.m_out)
@@ -97,7 +97,7 @@ public:
#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
/// Move constructor
- basic<concurrency,names>(basic<concurrency,names> && other)
+ basic(basic<concurrency,names> && other)
: m_static_channels(other.m_static_channels)
, m_dynamic_channels(other.m_dynamic_channels)
, m_out(other.m_out)

View File

@ -6,6 +6,8 @@ vcpkg_from_github(
REF 56123c87598f8b1dd471be83ca841ceae07f95ba # 0.8.2
SHA512 f185a66e5a7c783254352a6ef87e2e559f681032b7368765d08393ed12bcae76825abed7dcaea73de09df644320409dad46279701f5f469520542a2c9b6a6163
HEAD_REF master
PATCHES
cxx20.patch
)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT})

View File

@ -1,7 +1,7 @@
{
"name": "websocketpp",
"version": "0.8.2",
"port-version": 1,
"port-version": 2,
"description": "Library that implements RFC6455 The WebSocket Protocol",
"homepage": "https://github.com/zaphoyd/websocketpp",
"documentation": "http://docs.websocketpp.org/",

View File

@ -7366,7 +7366,7 @@
},
"websocketpp": {
"baseline": "0.8.2",
"port-version": 1
"port-version": 2
},
"wepoll": {
"baseline": "1.5.8",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "70d3b037559f580fa52bc50bb2dc26e58f5107d9",
"version": "0.8.2",
"port-version": 2
},
{
"git-tree": "495a31980417d3ca202b50c1951012d699af21f6",
"version": "0.8.2",