summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-02-23 21:23:35 +0100
committerTycho <work.tycho+git@gmail.com>2014-02-23 21:23:35 +0100
commit462e0bcf46ce8e7c29e9f00ace58c2fcebffb8d1 (patch)
tree319614feeb429ae401d120f458e2555b426cadd4
parentUpdated CONTRIBUTING file with formatting and essential rules. (diff)
downloadcuberite-462e0bcf46ce8e7c29e9f00ace58c2fcebffb8d1.tar
cuberite-462e0bcf46ce8e7c29e9f00ace58c2fcebffb8d1.tar.gz
cuberite-462e0bcf46ce8e7c29e9f00ace58c2fcebffb8d1.tar.bz2
cuberite-462e0bcf46ce8e7c29e9f00ace58c2fcebffb8d1.tar.lz
cuberite-462e0bcf46ce8e7c29e9f00ace58c2fcebffb8d1.tar.xz
cuberite-462e0bcf46ce8e7c29e9f00ace58c2fcebffb8d1.tar.zst
cuberite-462e0bcf46ce8e7c29e9f00ace58c2fcebffb8d1.zip
Diffstat (limited to '')
m---------MCServer/Plugins/Core0
-rw-r--r--src/ChunkDef.h1
-rw-r--r--src/LightingThread.h6
-rw-r--r--src/OSSupport/Queue.h6
4 files changed, 11 insertions, 2 deletions
diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core
-Subproject 3b416b07a339b3abcbc127070d56eea05b05373
+Subproject 5c8557d4fdfa580c100510cde07a1a778ea2e24
diff --git a/src/ChunkDef.h b/src/ChunkDef.h
index f48dc4fd5..7be2fa2df 100644
--- a/src/ChunkDef.h
+++ b/src/ChunkDef.h
@@ -92,6 +92,7 @@ public:
/// Converts absolute block coords into relative (chunk + block) coords:
inline static void AbsoluteToRelative(/* in-out */ int & a_X, int & a_Y, int & a_Z, /* out */ int & a_ChunkX, int & a_ChunkZ )
{
+ UNUSED(a_Y);
BlockToChunk(a_X, a_Z, a_ChunkX, a_ChunkZ);
a_X = a_X - a_ChunkX * Width;
diff --git a/src/LightingThread.h b/src/LightingThread.h
index 81dd9d61f..72d561348 100644
--- a/src/LightingThread.h
+++ b/src/LightingThread.h
@@ -82,7 +82,11 @@ protected:
cLightingChunkStay(cLightingThread & a_LightingThread, int a_ChunkX, int a_ChunkZ, cChunkCoordCallback * a_CallbackAfter);
protected:
- virtual void OnChunkAvailable(int a_ChunkX, int a_ChunkZ) override {}
+ virtual void OnChunkAvailable(int a_ChunkX, int a_ChunkZ) override
+ {
+ UNUSED(a_ChunkX);
+ UNUSED(a_ChunkZ);
+ }
virtual bool OnAllChunksAvailable(void) override;
virtual void OnDisabled(void) override;
} ;
diff --git a/src/OSSupport/Queue.h b/src/OSSupport/Queue.h
index 6c3d58295..beb6a63f1 100644
--- a/src/OSSupport/Queue.h
+++ b/src/OSSupport/Queue.h
@@ -29,7 +29,11 @@ public:
static void Delete(T) {};
/// Called when an Item is inserted with EnqueueItemIfNotPresent and there is another equal value already inserted
- static void Combine(T & a_existing, const T & a_new) {};
+ static void Combine(T & a_existing, const T & a_new)
+ {
+ UNUSED(a_existing);
+ UNUSED(a_new);
+ };
};