From 27eed1389b8bece41950c53b47acffb3bb0c83ee Mon Sep 17 00:00:00 2001 From: kwolekr Date: Tue, 27 Oct 2015 01:50:46 -0400 Subject: Move basic, non-numeric macros from util/numeric.h to basicmacros.h --- src/util/numeric.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/util') diff --git a/src/util/numeric.h b/src/util/numeric.h index 8a17d892d..643c44440 100644 --- a/src/util/numeric.h +++ b/src/util/numeric.h @@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef UTIL_NUMERIC_HEADER #define UTIL_NUMERIC_HEADER +#include "../basicmacros.h" #include "../irrlichttypes.h" #include "../irr_v2d.h" #include "../irr_v3d.h" @@ -28,7 +29,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include #include -#include /* @@ -166,9 +166,6 @@ inline v3s16 arealim(v3s16 p, s16 d) return p; } -#define ARRLEN(x) (sizeof(x) / sizeof((x)[0])) -#define CONTAINS(c, v) (std::find((c).begin(), (c).end(), (v)) != (c).end()) - // The naive swap performs better than the xor version #define SWAP(t, x, y) do { \ t temp = x; \ @@ -278,12 +275,6 @@ u64 murmur_hash_64_ua(const void *key, int len, unsigned int seed); bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir, f32 camera_fov, f32 range, f32 *distance_ptr=NULL); -/* - Some helper stuff -*/ -#define MYMIN(a,b) ((a)<(b)?(a):(b)) -#define MYMAX(a,b) ((a)>(b)?(a):(b)) - /* Returns nearest 32-bit integer for given floating point number. and in VC++ don't provide round(). -- cgit v1.2.3