Rename and move basicmacros.h to util/basic_macros.h

diff --git a/src/basicmacros.h b/src/basicmacros.h
deleted file mode 100644 (file)
index 2a30a31..0000000
--- a/src/basicmacros.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-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
-
-#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))
-
-#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 &)
-
-// Fail compilation if condition expr is not met.
-// Note that 'msg' must follow the format of a valid identifier, e.g.
-// STATIC_ASSERT(sizeof(foobar_t) == 40), foobar_t_is_wrong_size);
-#define STATIC_ASSERT(expr, msg) typedef char msg[!!(expr) * 2 - 1]
-
-#endif

diff --git a/src/objdef.h b/src/objdef.h
index 1dce367a9475f9c7c1ec01f88b4f70ac34e3a9f1..77189e45470d9ecfb11f66f2e87fd086639c5050 100644 (file)
--- a/src/objdef.h
+++ b/src/objdef.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef OBJDEF_HEADER
 #define OBJDEF_HEADER
 
-#include "basicmacros.h"
+#include "util/basic_macros.h"
 #include "porting.h"
 
 class IGameDef;

diff --git a/src/threading/mutex.h b/src/threading/mutex.h
index 62a48278717a3706a1fbf972c30292f4ce635c9d..40b10a2ea05995b1060901b44cd5ecd8f15c2285 100644 (file)
--- a/src/threading/mutex.h
+++ b/src/threading/mutex.h
@@ -44,7 +44,7 @@ DEALINGS IN THE SOFTWARE.
        #include <pthread.h>
 #endif
 
-#include "basicmacros.h"
+#include "util/basic_macros.h"
 
 class Mutex
 {

diff --git a/src/threading/semaphore.h b/src/threading/semaphore.h
index 736f2bc784d145d8801939e587f3b7aef57d28d2..822856396c7cf9d5699bde46f434ff41d67a2092 100644 (file)
--- a/src/threading/semaphore.h
+++ b/src/threading/semaphore.h
@@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        #include <semaphore.h>
 #endif
 
-#include "basicmacros.h"
+#include "util/basic_macros.h"
 
 class Semaphore {
 public:

diff --git a/src/threading/thread.h b/src/threading/thread.h
index 5f2d8aad192814232ef27ede4e98c1a06db22a8e..6a24afffb72ea9b1299c7df3239f7c5cef4caabe 100644 (file)
--- a/src/threading/thread.h
+++ b/src/threading/thread.h
@@ -26,7 +26,7 @@ DEALINGS IN THE SOFTWARE.
 #ifndef THREADING_THREAD_H
 #define THREADING_THREAD_H
 
-#include "basicmacros.h"
+#include "util/basic_macros.h"
 #include "threading/atomic.h"
 #include "threading/mutex.h"
 #include "threads.h"

diff --git a/src/util/basic_macros.h b/src/util/basic_macros.h
new file mode 100644 (file)
index 0000000..2a30a31
--- /dev/null
+++ b/src/util/basic_macros.h
@@ -0,0 +1,46 @@
+/*
+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
+
+#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))
+
+#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 &)
+
+// Fail compilation if condition expr is not met.
+// Note that 'msg' must follow the format of a valid identifier, e.g.
+// STATIC_ASSERT(sizeof(foobar_t) == 40), foobar_t_is_wrong_size);
+#define STATIC_ASSERT(expr, msg) typedef char msg[!!(expr) * 2 - 1]
+
+#endif

diff --git a/src/util/numeric.h b/src/util/numeric.h
index 643c444409af64aca6ba094901ce4b6559914d41..e742ab24aa2a5ab7340ec83333d4e2881eb24d9e 100644 (file)
--- a/src/util/numeric.h
+++ b/src/util/numeric.h
@@ -20,7 +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 "basic_macros.h"
 #include "../irrlichttypes.h"
 #include "../irr_v2d.h"
 #include "../irr_v3d.h"