From d575c7c2a94343a828ee07bd3a20a652be816ad7 Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Sat, 11 May 2019 14:22:41 -0700 Subject: [PATCH 1/2] bump version to 2.0.0 --- DOCKER_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DOCKER_VERSION b/DOCKER_VERSION index 8af85beb..227cea21 100644 --- a/DOCKER_VERSION +++ b/DOCKER_VERSION @@ -1 +1 @@ -1.5.3 +2.0.0 From 7740028291a3c11dc706dcc7c2ba96d8c699c2ad Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Sun, 12 May 2019 11:43:21 -0700 Subject: [PATCH 2/2] all derived class use final keyword --- ixwebsocket/IXSelectInterruptEventFd.h | 2 +- ixwebsocket/IXSelectInterruptPipe.h | 2 +- ixwebsocket/IXSocketAppleSSL.h | 2 +- ixwebsocket/IXSocketOpenSSL.h | 2 +- ixwebsocket/IXSocketSChannel.h | 2 +- ixwebsocket/IXWebSocketServer.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ixwebsocket/IXSelectInterruptEventFd.h b/ixwebsocket/IXSelectInterruptEventFd.h index 415ec5bb..5d957b0d 100644 --- a/ixwebsocket/IXSelectInterruptEventFd.h +++ b/ixwebsocket/IXSelectInterruptEventFd.h @@ -13,7 +13,7 @@ namespace ix { - class SelectInterruptEventFd : public SelectInterrupt { + class SelectInterruptEventFd final : public SelectInterrupt { public: SelectInterruptEventFd(); virtual ~SelectInterruptEventFd(); diff --git a/ixwebsocket/IXSelectInterruptPipe.h b/ixwebsocket/IXSelectInterruptPipe.h index 1240f9a5..dfac989a 100644 --- a/ixwebsocket/IXSelectInterruptPipe.h +++ b/ixwebsocket/IXSelectInterruptPipe.h @@ -14,7 +14,7 @@ namespace ix { - class SelectInterruptPipe : public SelectInterrupt { + class SelectInterruptPipe final : public SelectInterrupt { public: SelectInterruptPipe(); virtual ~SelectInterruptPipe(); diff --git a/ixwebsocket/IXSocketAppleSSL.h b/ixwebsocket/IXSocketAppleSSL.h index 72dacf1d..58e4dcb5 100644 --- a/ixwebsocket/IXSocketAppleSSL.h +++ b/ixwebsocket/IXSocketAppleSSL.h @@ -16,7 +16,7 @@ namespace ix { - class SocketAppleSSL : public Socket + class SocketAppleSSL final : public Socket { public: SocketAppleSSL(int fd = -1); diff --git a/ixwebsocket/IXSocketOpenSSL.h b/ixwebsocket/IXSocketOpenSSL.h index 9fa55a5a..d52ba1d5 100644 --- a/ixwebsocket/IXSocketOpenSSL.h +++ b/ixwebsocket/IXSocketOpenSSL.h @@ -19,7 +19,7 @@ namespace ix { - class SocketOpenSSL : public Socket + class SocketOpenSSL final : public Socket { public: SocketOpenSSL(int fd = -1); diff --git a/ixwebsocket/IXSocketSChannel.h b/ixwebsocket/IXSocketSChannel.h index 10e4132f..5394600c 100644 --- a/ixwebsocket/IXSocketSChannel.h +++ b/ixwebsocket/IXSocketSChannel.h @@ -10,7 +10,7 @@ namespace ix { - class SocketSChannel : public Socket + class SocketSChannel final : public Socket { public: SocketSChannel(); diff --git a/ixwebsocket/IXWebSocketServer.h b/ixwebsocket/IXWebSocketServer.h index 744d0709..67f4c606 100644 --- a/ixwebsocket/IXWebSocketServer.h +++ b/ixwebsocket/IXWebSocketServer.h @@ -23,7 +23,7 @@ namespace ix using OnConnectionCallback = std::function, std::shared_ptr)>; - class WebSocketServer : public SocketServer { + class WebSocketServer final : public SocketServer { public: WebSocketServer(int port = SocketServer::kDefaultPort, const std::string& host = SocketServer::kDefaultHost,