summaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2015-10-27 01:50:46 -0400
committerkwolekr <kwolekr@minetest.net>2015-10-27 01:53:45 -0400
commit27eed1389b8bece41950c53b47acffb3bb0c83ee (patch)
treecada2292121b26707b6155fc0ae3ddabc82437cb /src/util
parent8a6e921cb8c9886db598dd77ddde3e7ba294085a (diff)
downloadminetest-27eed1389b8bece41950c53b47acffb3bb0c83ee.tar.gz
minetest-27eed1389b8bece41950c53b47acffb3bb0c83ee.tar.bz2
minetest-27eed1389b8bece41950c53b47acffb3bb0c83ee.zip
Move basic, non-numeric macros from util/numeric.h to basicmacros.h
Diffstat (limited to 'src/util')
-rw-r--r--src/util/numeric.h11
1 files changed, 1 insertions, 10 deletions
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 <list>
#include <map>
#include <vector>
-#include <algorithm>
/*
@@ -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; \
@@ -279,12 +276,6 @@ 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.
<cmath> and <math.h> in VC++ don't provide round().
*/