diff options
| author | kwolekr <kwolekr@minetest.net> | 2015-10-27 01:50:46 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2015-10-27 01:53:45 -0400 |
| commit | 27eed1389b8bece41950c53b47acffb3bb0c83ee (patch) | |
| tree | cada2292121b26707b6155fc0ae3ddabc82437cb /src | |
| parent | 8a6e921cb8c9886db598dd77ddde3e7ba294085a (diff) | |
| download | minetest-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')
| -rw-r--r-- | src/basicmacros.h | 31 | ||||
| -rw-r--r-- | src/util/numeric.h | 11 |
2 files changed, 32 insertions, 10 deletions
diff --git a/src/basicmacros.h b/src/basicmacros.h new file mode 100644 index 000000000..2b183d6c5 --- /dev/null +++ b/src/basicmacros.h @@ -0,0 +1,31 @@ +/* +Minetest +Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com> + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#ifndef BASICMACROS_HEADER +#define BASICMACROS_HEADER + +#define ARRLEN(x) (sizeof(x) / sizeof((x)[0])) + +#define MYMIN(a, b) ((a) < (b) ? (a) : (b)) + +#define MYMAX(a, b) ((a) > (b) ? (a) : (b)) + +#define CONTAINS(c, v) (std::find((c).begin(), (c).end(), (v)) != (c).end()) + +#endif 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(). */ |