diff options
| author | tycho <work.tycho@gmail.com> | 2015-05-24 15:16:05 +0200 |
|---|---|---|
| committer | tycho <work.tycho@gmail.com> | 2015-05-24 15:16:05 +0200 |
| commit | 95b81b3ef1885f822907ae3f3999ef1cf543e105 (patch) | |
| tree | 44c7b063dbefcd79a684a4afb4ba7de1daae50c2 /tests/ChunkData | |
| parent | Disable -Werror for warnings in tools. (diff) | |
| download | cuberite-95b81b3ef1885f822907ae3f3999ef1cf543e105.tar cuberite-95b81b3ef1885f822907ae3f3999ef1cf543e105.tar.gz cuberite-95b81b3ef1885f822907ae3f3999ef1cf543e105.tar.bz2 cuberite-95b81b3ef1885f822907ae3f3999ef1cf543e105.tar.lz cuberite-95b81b3ef1885f822907ae3f3999ef1cf543e105.tar.xz cuberite-95b81b3ef1885f822907ae3f3999ef1cf543e105.tar.zst cuberite-95b81b3ef1885f822907ae3f3999ef1cf543e105.zip | |
Diffstat (limited to '')
| -rw-r--r-- | tests/ChunkData/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/ChunkData/Coordinates.cpp | 12 |
2 files changed, 2 insertions, 13 deletions
diff --git a/tests/ChunkData/CMakeLists.txt b/tests/ChunkData/CMakeLists.txt index 4079b7d93..bd2d6d9b4 100644 --- a/tests/ChunkData/CMakeLists.txt +++ b/tests/ChunkData/CMakeLists.txt @@ -3,9 +3,8 @@ cmake_minimum_required (VERSION 2.6) enable_testing() include_directories(${CMAKE_SOURCE_DIR}/src/) - - if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + add_flags_cxx("-Wno-error=old-style-cast") set_source_files_properties(${CMAKE_SOURCE_DIR}/src/ChunkData.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=sign-conversion") set_source_files_properties(${CMAKE_SOURCE_DIR}/src/StringUtils.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=conversion") endif() diff --git a/tests/ChunkData/Coordinates.cpp b/tests/ChunkData/Coordinates.cpp index b3c66dde5..de6686243 100644 --- a/tests/ChunkData/Coordinates.cpp +++ b/tests/ChunkData/Coordinates.cpp @@ -8,7 +8,7 @@ int main(int argc, char** argv) { class cMockAllocationPool : public cAllocationPool<cChunkData::sChunkSection> - { + { virtual cChunkData::sChunkSection * Allocate() { return new cChunkData::sChunkSection(); @@ -138,17 +138,7 @@ int main(int argc, char** argv) cChunkData buffer(Pool); buffer.SetBlock(0, 0, 0, 0x42); cChunkData copy(Pool); - #if __cplusplus < 201103L - copy = buffer; - #else copy = std::move(buffer); - #endif - testassert(copy.GetBlock(0, 0, 0) == 0x42); - #if __cplusplus < 201103L - copy = copy; - #else - copy = std::move(copy); - #endif testassert(copy.GetBlock(0, 0, 0) == 0x42); } |