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

inject TestGlobals.h correctly

Browse Source
This commit is contained in:
Tycho 2014-05-24 14:09:51 +01:00
parent 7fac63cffb
commit 944d29c0ae
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ChunkData.cpp
View File

@ -1,5 +1,9 @@
#ifdef TEST_GLOBALS
#include "TestGlobals.h"
#else
#include "Globals.h" #include "Globals.h"
#endif
#include "ChunkData.h" #include "ChunkData.h"
cChunkData::cChunkData() cChunkData::cChunkData()
@ -39,7 +43,7 @@ cChunkData::~cChunkData()
other.IsOwner = false; other.IsOwner = false;
} }
cChunkData::cChunkData& operator=(const cChunkData& other) cChunkData& cChunkData::operator=(const cChunkData& other)
{ {
if (&other != this) if (&other != this)
{ {
@ -71,7 +75,7 @@ cChunkData::~cChunkData()
} }
} }
cChunkData::cChunkData& operator=(cChunkData&& other) cChunkData& cChunkData::operator=(cChunkData&& other)
{ {
if (&other != this) if (&other != this)
{ {
@ -230,7 +234,7 @@ NIBBLETYPE cChunkData::GetSkyLight(int a_RelX, int a_RelY, int a_RelZ) const
return 0; return 0;
} }
cChunkData cChunkData::cChunkData::Copy() const cChunkData cChunkData::Copy() const
{ {
cChunkData copy; cChunkData copy;
for (size_t i = 0; i < CHUNK_SECTION_COUNT; i++) for (size_t i = 0; i < CHUNK_SECTION_COUNT; i++)

1
tests/ChunkData/CMakeLists.txt
View File

@ -4,6 +4,7 @@ enable_testing()
include_directories(${CMAKE_SOURCE_DIR}/src/) include_directories(${CMAKE_SOURCE_DIR}/src/)
add_definitions(-DTEST_GLOBALS=1)
add_library(ChunkBuffer ${CMAKE_SOURCE_DIR}/src/ChunkData.cpp) add_library(ChunkBuffer ${CMAKE_SOURCE_DIR}/src/ChunkData.cpp)

4
tests/TestGlobals.h
View File

@ -126,9 +126,9 @@ class cAssertFailure
#define UNUSED(X) (void)(X) #define UNUSED(X) (void)(X)
// Logging functions // Logging functions
void LOGERROR(const char* a_Format, ...) FORMATSTRING(1,2); void inline LOGERROR(const char* a_Format, ...) FORMATSTRING(1,2);
void LOGERROR(const char* a_Format, ...) void inline LOGERROR(const char* a_Format, ...)
{ {
va_list argList; va_list argList;
va_start(argList, a_Format); va_start(argList, a_Format);