diff options
author | Tycho <work.tycho+git@gmail.com> | 2014-03-07 19:26:07 +0100 |
---|---|---|
committer | Tycho <work.tycho+git@gmail.com> | 2014-03-07 19:26:07 +0100 |
commit | b480148116ea7099c9a6afda83f74a3d45815a83 (patch) | |
tree | 0c2d81026e0b10f3be435e3d7e21528113b7e89f /src | |
parent | Merge pull request #765 from worktycho/fastmath (diff) | |
download | cuberite-b480148116ea7099c9a6afda83f74a3d45815a83.tar cuberite-b480148116ea7099c9a6afda83f74a3d45815a83.tar.gz cuberite-b480148116ea7099c9a6afda83f74a3d45815a83.tar.bz2 cuberite-b480148116ea7099c9a6afda83f74a3d45815a83.tar.lz cuberite-b480148116ea7099c9a6afda83f74a3d45815a83.tar.xz cuberite-b480148116ea7099c9a6afda83f74a3d45815a83.tar.zst cuberite-b480148116ea7099c9a6afda83f74a3d45815a83.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Bindings/LuaState.cpp | 1 | ||||
-rw-r--r-- | src/Items/ItemHandler.h | 3 | ||||
-rw-r--r-- | src/OSSupport/SocketThreads.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/Bindings/LuaState.cpp b/src/Bindings/LuaState.cpp index 1890dcfe5..aa6ee05b3 100644 --- a/src/Bindings/LuaState.cpp +++ b/src/Bindings/LuaState.cpp @@ -677,6 +677,7 @@ void cLuaState::Push(Vector3i * a_Vector) void cLuaState::Push(void * a_Ptr) { + UNUSED(a_Ptr); ASSERT(IsValid()); // Investigate the cause of this - what is the callstack? diff --git a/src/Items/ItemHandler.h b/src/Items/ItemHandler.h index ef3f37a7a..5b6c239cc 100644 --- a/src/Items/ItemHandler.h +++ b/src/Items/ItemHandler.h @@ -21,6 +21,9 @@ class cItemHandler public: cItemHandler(int a_ItemType); + // Force virtual destructor + virtual ~cItemHandler() {} + /// Called when the player tries to use the item (right mouse button). Return false to make the item unusable. DEFAULT: False virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir); diff --git a/src/OSSupport/SocketThreads.h b/src/OSSupport/SocketThreads.h index fcd2ce11f..b2eb5950f 100644 --- a/src/OSSupport/SocketThreads.h +++ b/src/OSSupport/SocketThreads.h @@ -103,7 +103,7 @@ private: public: cSocketThread(cSocketThreads * a_Parent); - ~cSocketThread(); + virtual ~cSocketThread(); // All these methods assume parent's m_CS is locked bool HasEmptySlot(void) const {return m_NumSlots < MAX_SLOTS; } |