Skip to content

Commit 3197a52

Browse files
author
Peter Thorson
committed
[core] Remove the use of simple template ids as they have been removed in c++20. https://timsong-cpp.github.io/cppwp/n4861/diff.cpp17.class#2 references #991
1 parent 105b0e3 commit 3197a52

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

websocketpp/endpoint.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class endpoint : public config::transport_type, public config::endpoint_base {
111111

112112

113113
/// Destructor
114-
~endpoint<connection,config>() {}
114+
~endpoint() {}
115115

116116
#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
117117
// no copy constructor because endpoints are not copyable

websocketpp/logger/basic.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,33 +58,33 @@ namespace log {
5858
template <typename concurrency, typename names>
5959
class basic {
6060
public:
61-
basic<concurrency,names>(channel_type_hint::value h =
61+
basic(channel_type_hint::value h =
6262
channel_type_hint::access)
6363
: m_static_channels(0xffffffff)
6464
, m_dynamic_channels(0)
6565
, m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {}
6666

67-
basic<concurrency,names>(std::ostream * out)
67+
basic(std::ostream * out)
6868
: m_static_channels(0xffffffff)
6969
, m_dynamic_channels(0)
7070
, m_out(out) {}
7171

72-
basic<concurrency,names>(level c, channel_type_hint::value h =
72+
basic(level c, channel_type_hint::value h =
7373
channel_type_hint::access)
7474
: m_static_channels(c)
7575
, m_dynamic_channels(0)
7676
, m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {}
7777

78-
basic<concurrency,names>(level c, std::ostream * out)
78+
basic(level c, std::ostream * out)
7979
: m_static_channels(c)
8080
, m_dynamic_channels(0)
8181
, m_out(out) {}
8282

8383
/// Destructor
84-
~basic<concurrency,names>() {}
84+
~basic() {}
8585

8686
/// Copy constructor
87-
basic<concurrency,names>(basic<concurrency,names> const & other)
87+
basic(basic<concurrency,names> const & other)
8888
: m_static_channels(other.m_static_channels)
8989
, m_dynamic_channels(other.m_dynamic_channels)
9090
, m_out(other.m_out)
@@ -97,7 +97,7 @@ class basic {
9797

9898
#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
9999
/// Move constructor
100-
basic<concurrency,names>(basic<concurrency,names> && other)
100+
basic(basic<concurrency,names> && other)
101101
: m_static_channels(other.m_static_channels)
102102
, m_dynamic_channels(other.m_dynamic_channels)
103103
, m_out(other.m_out)

websocketpp/roles/server_endpoint.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,19 @@ class server : public endpoint<connection<config>,config> {
7575
}
7676

7777
/// Destructor
78-
~server<config>() {}
78+
~server() {}
7979

8080
#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
8181
// no copy constructor because endpoints are not copyable
82-
server<config>(server<config> &) = delete;
82+
server(server<config> &) = delete;
8383

8484
// no copy assignment operator because endpoints are not copyable
8585
server<config> & operator=(server<config> const &) = delete;
8686
#endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
8787

8888
#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
8989
/// Move constructor
90-
server<config>(server<config> && o) : endpoint<connection<config>,config>(std::move(o)) {}
90+
server(server<config> && o) : endpoint<connection<config>,config>(std::move(o)) {}
9191

9292
#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
9393
// no move assignment operator because of const member variables

0 commit comments

Comments
 (0)