diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-01-03 17:56:20 +0100 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-01-03 17:56:20 +0100 |
| commit | 13bbb3d99dee8041d47279cae3484c3083491f18 (patch) | |
| tree | 32ef15a952322dcdad4ad7f86e15eff70fc7f9f8 | |
| parent | actual fix (diff) | |
| download | cuberite-13bbb3d99dee8041d47279cae3484c3083491f18.tar cuberite-13bbb3d99dee8041d47279cae3484c3083491f18.tar.gz cuberite-13bbb3d99dee8041d47279cae3484c3083491f18.tar.bz2 cuberite-13bbb3d99dee8041d47279cae3484c3083491f18.tar.lz cuberite-13bbb3d99dee8041d47279cae3484c3083491f18.tar.xz cuberite-13bbb3d99dee8041d47279cae3484c3083491f18.tar.zst cuberite-13bbb3d99dee8041d47279cae3484c3083491f18.zip | |
| -rw-r--r-- | lib/tolua++/Makefile | 3 | ||||
| -rw-r--r-- | src/OSSupport/Queue.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/tolua++/Makefile b/lib/tolua++/Makefile index c15b4fc80..3bbda9b15 100644 --- a/lib/tolua++/Makefile +++ b/lib/tolua++/Makefile @@ -35,6 +35,9 @@ CMAKE_COMMAND = /usr/bin/cmake # The command to remove a file. RM = /usr/bin/cmake -E remove -f +# Escaping for special characters. +EQUALS = = + # The top-level source directory on which CMake was run. CMAKE_SOURCE_DIR = /home/tycho/MCServer diff --git a/src/OSSupport/Queue.h b/src/OSSupport/Queue.h index fc942b3e1..ab42c871e 100644 --- a/src/OSSupport/Queue.h +++ b/src/OSSupport/Queue.h @@ -131,7 +131,7 @@ public: } // Removes an Item from the queue - bool Remove(ItemType item) + bool Remove(ItemType a_item) { cCSLock Lock(m_CS); for (iterator itr = m_contents.begin(); itr != m_contents.end(); ++itr) |