summaryrefslogtreecommitdiff
path: root/src/util/basic_macros.h
diff options
context:
space:
mode:
authorShadowNinja <shadowninja@minetest.net>2015-07-06 12:53:30 -0400
committerShadowNinja <shadowninja@minetest.net>2017-05-06 16:09:45 -0400
commit77597c4ff3b666cc37dd257952938df48d7e6f09 (patch)
tree00e8ce314ddf1c3eb52bbe6f3521b8a1ea0200ff /src/util/basic_macros.h
parentb6f4a9c7e1a4f0bac66fd6f6ff844425ac775975 (diff)
downloadminetest-77597c4ff3b666cc37dd257952938df48d7e6f09.tar.gz
minetest-77597c4ff3b666cc37dd257952938df48d7e6f09.tar.bz2
minetest-77597c4ff3b666cc37dd257952938df48d7e6f09.zip
Clean up numeric.h and split FacePositionCache from it
I also optiized FacePositionCache a bit: I removed a map lookup and vector copy from both branches of getFacePosition.
Diffstat (limited to 'src/util/basic_macros.h')
-rw-r--r--src/util/basic_macros.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/util/basic_macros.h b/src/util/basic_macros.h
index bd4b890eb..687d7cf85 100644
--- a/src/util/basic_macros.h
+++ b/src/util/basic_macros.h
@@ -20,14 +20,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef BASICMACROS_HEADER
#define BASICMACROS_HEADER
-#include <algorithm>
-
#define ARRLEN(x) (sizeof(x) / sizeof((x)[0]))
#define MYMIN(a, b) ((a) < (b) ? (a) : (b))
#define MYMAX(a, b) ((a) > (b) ? (a) : (b))
+// Requires <algorithm>
#define CONTAINS(c, v) (std::find((c).begin(), (c).end(), (v)) != (c).end())
// To disable copy constructors and assignment operations for some class