flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #717 from worktycho/warningfixes

Browse Source 
fixed globals.h warnings
This commit is contained in:
Mattes D 2014-02-23 21:52:54 +01:00
commit 93f881fab4
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ChunkDef.h
View File

@ -92,6 +92,7 @@ public:
/// Converts absolute block coords into relative (chunk + block) coords: /// 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 ) 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); BlockToChunk(a_X, a_Z, a_ChunkX, a_ChunkZ);
a_X = a_X - a_ChunkX * Width; a_X = a_X - a_ChunkX * Width;

6
src/LightingThread.h
View File

@ -82,7 +82,11 @@ protected:
cLightingChunkStay(cLightingThread & a_LightingThread, int a_ChunkX, int a_ChunkZ, cChunkCoordCallback * a_CallbackAfter); cLightingChunkStay(cLightingThread & a_LightingThread, int a_ChunkX, int a_ChunkZ, cChunkCoordCallback * a_CallbackAfter);
protected: 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 bool OnAllChunksAvailable(void) override;
virtual void OnDisabled(void) override; virtual void OnDisabled(void) override;
} ; } ;

6
src/OSSupport/Queue.h
View File

@ -29,7 +29,11 @@ public:
static void Delete(T) {}; static void Delete(T) {};
/// Called when an Item is inserted with EnqueueItemIfNotPresent and there is another equal value already inserted /// 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);
};
}; };