1
0

Merge branch 'master' into noreturn

Conflicts:
	SetFlags.cmake
This commit is contained in:
Tycho 2014-03-14 08:04:48 -07:00
commit 693e59c6a4
4 changed files with 3 additions and 11 deletions

View File

@ -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()

View File

@ -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

View File

@ -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

View File

@ -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))