From eabfe091b5ecfa6e53b70e08faf76df7f0684529 Mon Sep 17 00:00:00 2001 From: est31 Date: Sat, 31 Oct 2015 03:06:36 +0100 Subject: Rename and move basicmacros.h to util/basic_macros.h --- src/basicmacros.h | 46 ---------------------------------------------- src/objdef.h | 2 +- src/threading/mutex.h | 2 +- src/threading/semaphore.h | 2 +- src/threading/thread.h | 2 +- src/util/basic_macros.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/numeric.h | 2 +- 7 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 src/basicmacros.h create mode 100644 src/util/basic_macros.h (limited to 'src') diff --git a/src/basicmacros.h b/src/basicmacros.h deleted file mode 100644 index 2a30a31d2..000000000 --- a/src/basicmacros.h +++ /dev/null @@ -1,46 +0,0 @@ -/* -Minetest -Copyright (C) 2010-2013 celeron55, Perttu Ahola - -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 - -#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 1dce367a9..77189e454 100644 --- 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 62a482787..40b10a2ea 100644 --- a/src/threading/mutex.h +++ b/src/threading/mutex.h @@ -44,7 +44,7 @@ DEALINGS IN THE SOFTWARE. #include #endif -#include "basicmacros.h" +#include "util/basic_macros.h" class Mutex { diff --git a/src/threading/semaphore.h b/src/threading/semaphore.h index 736f2bc78..822856396 100644 --- 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 #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 5f2d8aad1..6a24afffb 100644 --- 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 index 000000000..2a30a31d2 --- /dev/null +++ b/src/util/basic_macros.h @@ -0,0 +1,46 @@ +/* +Minetest +Copyright (C) 2010-2013 celeron55, Perttu Ahola + +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 + +#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 643c44440..e742ab24a 100644 --- 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" -- cgit v1.2.3