Expose getPointedThing to Lua

[oweals/minetest.git] / src / util / basic_macros.h

diff --git a/src/util/basic_macros.h b/src/util/basic_macros.h
index bd4b890eb20443f19fdbef48693e3ff4cf438b33..71be13a1fbfb01b2f8c325af85b81dd08c5dd2c6 100644 (file)
--- a/src/util/basic_macros.h
+++ b/src/util/basic_macros.h
@@ -20,23 +20,22 @@ 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
 // 'Foobar', add the macro DISABLE_CLASS_COPY(Foobar) as a private member.
 // Note this also disables copying for any classes derived from 'Foobar' as well
 // as classes having a 'Foobar' member.
-#define DISABLE_CLASS_COPY(C) \
-       C(const C &);             \
-       C &operator=(const C &)
+#define DISABLE_CLASS_COPY(C)        \
+       C(const C &) = delete;           \
+       C &operator=(const C &) = delete;
 
 #ifndef _MSC_VER
        #define UNUSED_ATTRIBUTE __attribute__ ((unused))