From e35ac1bfb9b63bf1e49dafdcce2033ff42d7c205 Mon Sep 17 00:00:00 2001 From: Lukas Pioch Date: Sat, 20 May 2017 08:16:28 +0200 Subject: Clang 5.0 fixes - Added override keyword - Removed inherited member variables --- src/Bindings/LuaChunkStay.h | 2 +- src/Bindings/LuaServerHandle.h | 2 +- src/Bindings/LuaTCPLink.h | 2 +- src/Bindings/LuaUDPEndpoint.h | 2 +- src/Bindings/LuaWindow.h | 2 +- src/Bindings/PluginLua.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/Bindings') diff --git a/src/Bindings/LuaChunkStay.h b/src/Bindings/LuaChunkStay.h index 175260978..f82647141 100644 --- a/src/Bindings/LuaChunkStay.h +++ b/src/Bindings/LuaChunkStay.h @@ -32,7 +32,7 @@ class cLuaChunkStay public: cLuaChunkStay(); - ~cLuaChunkStay() { } + virtual ~cLuaChunkStay() override { } /** Adds chunks in the specified Lua table. Can be called only once. diff --git a/src/Bindings/LuaServerHandle.h b/src/Bindings/LuaServerHandle.h index 7632669ff..1aad45f52 100644 --- a/src/Bindings/LuaServerHandle.h +++ b/src/Bindings/LuaServerHandle.h @@ -34,7 +34,7 @@ public: wrapping the (listen-) callbacks that are in the specified table. */ cLuaServerHandle(UInt16 a_Port, cLuaState::cTableRefPtr && a_Callbacks); - ~cLuaServerHandle(); + virtual ~cLuaServerHandle() override; /** Called by cNetwork::Listen()'s binding. Sets the server handle around which this instance is wrapped, and a self SharedPtr for link management. */ diff --git a/src/Bindings/LuaTCPLink.h b/src/Bindings/LuaTCPLink.h index f4ca67018..4211c3b64 100644 --- a/src/Bindings/LuaTCPLink.h +++ b/src/Bindings/LuaTCPLink.h @@ -35,7 +35,7 @@ public: /** Creates a new instance of the link, attached to the specified plugin and wrapping the callbacks that are in the specified referenced table. */ cLuaTCPLink(cLuaState::cTableRefPtr && a_Callbacks, cLuaServerHandleWPtr a_Server); - ~cLuaTCPLink(); + virtual ~cLuaTCPLink() override; /** Sends the data contained in the string to the remote peer. Returns true if successful, false on immediate failure (queueing the data failed or link not available). */ diff --git a/src/Bindings/LuaUDPEndpoint.h b/src/Bindings/LuaUDPEndpoint.h index 338ea6648..04c6ea134 100644 --- a/src/Bindings/LuaUDPEndpoint.h +++ b/src/Bindings/LuaUDPEndpoint.h @@ -31,7 +31,7 @@ public: /** Creates a new instance of the endpoint, wrapping the callbacks that are in the specified table. */ cLuaUDPEndpoint(cLuaState::cTableRefPtr && a_Callbacks); - ~cLuaUDPEndpoint(); + virtual ~cLuaUDPEndpoint() override; /** Opens the endpoint so that it starts listening for incoming data on the specified port. a_Self is the shared pointer to self that the object keeps to keep itself alive for as long as it needs (for Lua). */ diff --git a/src/Bindings/LuaWindow.h b/src/Bindings/LuaWindow.h index d90d52a94..66efb2a32 100644 --- a/src/Bindings/LuaWindow.h +++ b/src/Bindings/LuaWindow.h @@ -42,7 +42,7 @@ public: cLuaWindow(cLuaState & a_LuaState, cWindow::WindowType a_WindowType, int a_SlotsX, int a_SlotsY, const AString & a_Title); // tolua_begin - virtual ~cLuaWindow(); + virtual ~cLuaWindow() override; /** Returns the internal representation of the contents that are manipulated by Lua */ cItemGrid & GetContents(void) { return m_Contents; } diff --git a/src/Bindings/PluginLua.h b/src/Bindings/PluginLua.h index 703cb8ead..af336f0a0 100644 --- a/src/Bindings/PluginLua.h +++ b/src/Bindings/PluginLua.h @@ -63,7 +63,7 @@ public: cPluginLua(const AString & a_PluginDirectory, cDeadlockDetect & a_DeadlockDetect); - ~cPluginLua(); + virtual ~cPluginLua() override; virtual void OnDisable(void) override; virtual bool Load(void) override; -- cgit v1.2.3