From 7658591eba7de1e62893be20afcb0d1130470625 Mon Sep 17 00:00:00 2001 From: Maxim Sharabayko Date: Fri, 23 Oct 2020 10:40:18 +0200 Subject: [PATCH] [apps] Added missing override, removed redundant virtual --- apps/srt-tunnel.cpp | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/apps/srt-tunnel.cpp b/apps/srt-tunnel.cpp index 0e5504fbd..0567b5764 100644 --- a/apps/srt-tunnel.cpp +++ b/apps/srt-tunnel.cpp @@ -448,20 +448,20 @@ class SrtMedium: public Medium // Forwarded in order to separate the implementation from // the virtual function so that virtual function is not // being called in destructor. - virtual void CloseInternal() override { return CloseSrt(); } + void CloseInternal() override { return CloseSrt(); } - virtual const char* type() override { return "srt"; } - virtual int ReadInternal(char* output, int size) override; - virtual bool IsErrorAgain() override; + const char* type() override { return "srt"; } + int ReadInternal(char* output, int size) override; + bool IsErrorAgain() override; - virtual void Write(bytevector& portion) override; - virtual void CreateListener() override; - virtual void CreateCaller() override; - virtual unique_ptr Accept() override; - virtual void Connect() override; + void Write(bytevector& portion) override; + void CreateListener() override; + void CreateCaller() override; + unique_ptr Accept() override; + void Connect() override; protected: - virtual void Init() override; + void Init() override; void ConfigurePre(); void ConfigurePost(SRTSOCKET socket); @@ -473,7 +473,7 @@ class SrtMedium: public Medium throw TransmissionError("ERROR: " + text + ": " + ri.getErrorMessage()); } - virtual ~SrtMedium() override + ~SrtMedium() override { CloseState(); CloseSrt(); @@ -534,16 +534,16 @@ class TcpMedium: public Medium tcp_close(m_socket); m_socket = -1; } - virtual void CloseInternal() { return CloseTcp(); } - - virtual const char* type() override { return "tcp"; } - virtual int ReadInternal(char* output, int size) override; - virtual bool IsErrorAgain() override; - virtual void Write(bytevector& portion) override; - virtual void CreateListener() override; - virtual void CreateCaller() override; - virtual unique_ptr Accept() override; - virtual void Connect() override; + void CloseInternal() override { return CloseTcp(); } + + const char* type() override { return "tcp"; } + int ReadInternal(char* output, int size) override; + bool IsErrorAgain() override; + void Write(bytevector& portion) override; + void CreateListener() override; + void CreateCaller() override; + unique_ptr Accept() override; + void Connect() override; protected: