1From 3197a520eb4c1e4754860441918a5930160373eb Mon Sep 17 00:00:00 2001
2From: Peter Thorson <git@zaphoyd.com>
3Date: Tue, 29 Jun 2021 09:13:12 -0500
4Subject: [PATCH] [core] Remove the use of simple template ids as they have
5 been removed in c++20.
6 https://timsong-cpp.github.io/cppwp/n4861/diff.cpp17.class#2 references #991
7
8Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
9Upstream: https://github.com/zaphoyd/websocketpp/commit/3197a520eb4c1e4754860441918a5930160373eb
10---
11 websocketpp/endpoint.hpp              |  2 +-
12 websocketpp/logger/basic.hpp          | 14 +++++++-------
13 websocketpp/roles/server_endpoint.hpp |  6 +++---
14 3 files changed, 11 insertions(+), 11 deletions(-)
15
16diff --git a/websocketpp/endpoint.hpp b/websocketpp/endpoint.hpp
17index 825eaa46d..10f525689 100644
18--- a/websocketpp/endpoint.hpp
19+++ b/websocketpp/endpoint.hpp
20@@ -111,7 +111,7 @@ class endpoint : public config::transport_type, public config::endpoint_base {
21
22
23     /// Destructor
24-    ~endpoint<connection,config>() {}
25+    ~endpoint() {}
26
27     #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
28         // no copy constructor because endpoints are not copyable
29diff --git a/websocketpp/logger/basic.hpp b/websocketpp/logger/basic.hpp
30index 84514130e..4c9d83649 100644
31--- a/websocketpp/logger/basic.hpp
32+++ b/websocketpp/logger/basic.hpp
33@@ -58,33 +58,33 @@ namespace log {
34 template <typename concurrency, typename names>
35 class basic {
36 public:
37-    basic<concurrency,names>(channel_type_hint::value h =
38+    basic(channel_type_hint::value h =
39         channel_type_hint::access)
40       : m_static_channels(0xffffffff)
41       , m_dynamic_channels(0)
42       , m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {}
43
44-    basic<concurrency,names>(std::ostream * out)
45+    basic(std::ostream * out)
46       : m_static_channels(0xffffffff)
47       , m_dynamic_channels(0)
48       , m_out(out) {}
49
50-    basic<concurrency,names>(level c, channel_type_hint::value h =
51+    basic(level c, channel_type_hint::value h =
52         channel_type_hint::access)
53       : m_static_channels(c)
54       , m_dynamic_channels(0)
55       , m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {}
56
57-    basic<concurrency,names>(level c, std::ostream * out)
58+    basic(level c, std::ostream * out)
59       : m_static_channels(c)
60       , m_dynamic_channels(0)
61       , m_out(out) {}
62
63     /// Destructor
64-    ~basic<concurrency,names>() {}
65+    ~basic() {}
66
67     /// Copy constructor
68-    basic<concurrency,names>(basic<concurrency,names> const & other)
69+    basic(basic<concurrency,names> const & other)
70      : m_static_channels(other.m_static_channels)
71      , m_dynamic_channels(other.m_dynamic_channels)
72      , m_out(other.m_out)
73@@ -97,7 +97,7 @@ class basic {
74
75 #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
76     /// Move constructor
77-    basic<concurrency,names>(basic<concurrency,names> && other)
78+    basic(basic<concurrency,names> && other)
79      : m_static_channels(other.m_static_channels)
80      , m_dynamic_channels(other.m_dynamic_channels)
81      , m_out(other.m_out)
82diff --git a/websocketpp/roles/server_endpoint.hpp b/websocketpp/roles/server_endpoint.hpp
83index 4a5865eff..04fee18f9 100644
84--- a/websocketpp/roles/server_endpoint.hpp
85+++ b/websocketpp/roles/server_endpoint.hpp
86@@ -75,11 +75,11 @@ class server : public endpoint<connection<config>,config> {
87     }
88
89     /// Destructor
90-    ~server<config>() {}
91+    ~server() {}
92
93 #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
94     // no copy constructor because endpoints are not copyable
95-    server<config>(server<config> &) = delete;
96+    server(server<config> &) = delete;
97
98     // no copy assignment operator because endpoints are not copyable
99     server<config> & operator=(server<config> const &) = delete;
100@@ -87,7 +87,7 @@ class server : public endpoint<connection<config>,config> {
101
102 #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
103     /// Move constructor
104-    server<config>(server<config> && o) : endpoint<connection<config>,config>(std::move(o)) {}
105+    server(server<config> && o) : endpoint<connection<config>,config>(std::move(o)) {}
106
107 #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
108     // no move assignment operator because of const member variables
109