forked from conan-io/conan-center-index
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(conan-io#15295) websocketpp: support gcc 12
* websocketpp: support gcc 12 * add patch_source
- Loading branch information
1 parent
e00be58
commit db0c131
Showing
3 changed files
with
103 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
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..51efa94 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 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 && other) | ||
: m_static_channels(other.m_static_channels) | ||
, m_dynamic_channels(other.m_dynamic_channels) | ||
, m_out(other.m_out) | ||
diff --git a/websocketpp/roles/server_endpoint.hpp b/websocketpp/roles/server_endpoint.hpp | ||
index 9cc652f..ad8f403 100644 | ||
--- a/websocketpp/roles/server_endpoint.hpp | ||
+++ b/websocketpp/roles/server_endpoint.hpp | ||
@@ -72,11 +72,11 @@ public: | ||
} | ||
|
||
/// Destructor | ||
- ~server<config>() {} | ||
+ ~server() {} | ||
|
||
#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ | ||
// no copy constructor because endpoints are not copyable | ||
- server<config>(server<config> &) = delete; | ||
+ server(server&) = delete; | ||
|
||
// no copy assignment operator because endpoints are not copyable | ||
server<config> & operator=(server<config> const &) = delete; | ||
@@ -84,7 +84,7 @@ public: | ||
|
||
#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_ | ||
/// Move constructor | ||
- server<config>(server<config> && o) : endpoint<connection<config>,config>(std::move(o)) {} | ||
+ server(server&& o) : endpoint<connection<config>,config>(std::move(o)) {} | ||
|
||
#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ | ||
// no move assignment operator because of const member variables |