summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-03-14 15:46:33 +0100
committerTycho <work.tycho+git@gmail.com>2014-03-14 15:46:33 +0100
commitc51a9b5fc221298970f81b7cd785457323dbd95c (patch)
treedb2e839cc09febf48735660e6fb2a7df3d63113b
parentMade unreachable code an error (diff)
parentMerge pull request #805 from worktycho/undef (diff)
downloadcuberite-c51a9b5fc221298970f81b7cd785457323dbd95c.tar
cuberite-c51a9b5fc221298970f81b7cd785457323dbd95c.tar.gz
cuberite-c51a9b5fc221298970f81b7cd785457323dbd95c.tar.bz2
cuberite-c51a9b5fc221298970f81b7cd785457323dbd95c.tar.lz
cuberite-c51a9b5fc221298970f81b7cd785457323dbd95c.tar.xz
cuberite-c51a9b5fc221298970f81b7cd785457323dbd95c.tar.zst
cuberite-c51a9b5fc221298970f81b7cd785457323dbd95c.zip
Diffstat (limited to '')
-rw-r--r--SetFlags.cmake2
-rw-r--r--src/BoundingBox.cpp2
-rw-r--r--src/CompositeChat.cpp2
-rw-r--r--src/Noise.cpp8
4 files changed, 3 insertions, 11 deletions
diff --git a/SetFlags.cmake b/SetFlags.cmake
index b22449142..fda87a601 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-missing-noreturn -Wno-error=undef")
+ add_flags_cxx("-Wno-missing-noreturn")
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))