diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-03-14 16:04:48 +0100 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-03-14 16:04:48 +0100 |
| commit | 693e59c6a4e47b5ee3d0422c6cdb9527d32491c0 (patch) | |
| tree | 91a1ab3710a58e8996345f0de21ccb9ee9cbaa63 | |
| parent | Added Noreturn attribtes to a couple of functions and made a missing noreturn an error (diff) | |
| parent | Merge pull request #805 from worktycho/undef (diff) | |
| download | cuberite-693e59c6a4e47b5ee3d0422c6cdb9527d32491c0.tar cuberite-693e59c6a4e47b5ee3d0422c6cdb9527d32491c0.tar.gz cuberite-693e59c6a4e47b5ee3d0422c6cdb9527d32491c0.tar.bz2 cuberite-693e59c6a4e47b5ee3d0422c6cdb9527d32491c0.tar.lz cuberite-693e59c6a4e47b5ee3d0422c6cdb9527d32491c0.tar.xz cuberite-693e59c6a4e47b5ee3d0422c6cdb9527d32491c0.tar.zst cuberite-693e59c6a4e47b5ee3d0422c6cdb9527d32491c0.zip | |
| -rw-r--r-- | SetFlags.cmake | 2 | ||||
| -rw-r--r-- | src/BoundingBox.cpp | 2 | ||||
| -rw-r--r-- | src/CompositeChat.cpp | 2 | ||||
| -rw-r--r-- | src/Noise.cpp | 8 |
4 files changed, 3 insertions, 11 deletions
diff --git a/SetFlags.cmake b/SetFlags.cmake index e636c5c95..b786da0d0 100644 --- a/SetFlags.cmake +++ b/SetFlags.cmake @@ -198,7 +198,7 @@ macro(set_exe_flags) add_flags_cxx("-Wno-error=covered-switch-default -Wno-error=shadow") add_flags_cxx("-Wno-error=exit-time-destructors -Wno-error=missing-variable-declarations") add_flags_cxx("-Wno-error=global-constructors -Wno-implicit-fallthrough") - add_flags_cxx("-Wno-error=unreachable-code -Wno-error=undef") + add_flags_cxx("-Wno-error=unreachable-code") endif() endif() diff --git a/src/BoundingBox.cpp b/src/BoundingBox.cpp index aab51c539..482f9923f 100644 --- a/src/BoundingBox.cpp +++ b/src/BoundingBox.cpp @@ -10,7 +10,7 @@ -#if SELF_TEST +#ifdef SELF_TEST /** A simple self-test that is executed on program start, used to verify bbox functionality */ static class SelfTest_BoundingBox diff --git a/src/CompositeChat.cpp b/src/CompositeChat.cpp index 19ed30d78..a917ee70f 100644 --- a/src/CompositeChat.cpp +++ b/src/CompositeChat.cpp @@ -10,7 +10,7 @@ -#if SELF_TEST +#ifdef SELF_TEST /** A simple self-test that verifies that the composite chat parser is working properly. */ class SelfTest_CompositeChat diff --git a/src/Noise.cpp b/src/Noise.cpp index 5f23a47f9..a97ea70c6 100644 --- a/src/Noise.cpp +++ b/src/Noise.cpp @@ -3,14 +3,6 @@ #include "Noise.h" - - - - -#if NOISE_USE_SSE - #include <smmintrin.h> //_mm_mul_epi32 -#endif - #define FAST_FLOOR(x) (((x) < 0) ? (((int)x) - 1) : ((int)x)) |